From b3be4efaabb682205382c79dd5eca762a7eda5d7 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Fri, 2 Mar 2018 16:02:01 -0500 Subject: [PATCH] Big reorganize of repository --- .../conf/bblayers.conf.sample | 3 +- .../conf/distro/citadel-distro.conf | 2 - .../conf/local.conf.sample | 0 .../files/citadel-fs-perms.txt | 0 .../images/citadel-image-base.bb | 0 .../images/citadel-image-minimal.bb | 0 .../images/citadel-image.bb | 0 .../images/citadel-initramfs-image.bb | 0 .../base-files/base-files_%.bbappend | 0 .../base-files/files/00-storage-tmpfiles.conf | 0 .../files/99-grsec-debootstrap.conf | 0 .../base-files/files/NetworkManager.conf | 0 .../base-files/files/environment.sh | 0 .../recipes-core/base-files/files/fstab | 0 .../recipes-core/base-files/files/locale.conf | 0 .../base-files/files/zram-swap.service | 0 .../citadel-desktop-gsettings.bb | 0 .../files/90_citadel.gschema.override | 0 .../citadel-initramfs/citadel-initramfs.bb | 0 .../citadel-initramfs/files/11-dm.rules | 0 .../citadel-initramfs/files/crypttab | 0 .../files/initrd-debug-shell.service | 0 .../citadel-initramfs/files/initrd-release | 0 .../recipes-core/citadel-user/citadel-user.bb | 0 .../recipes-core/mesa/mesa_%.bbappend | 0 .../packagegroup-citadel-base.bb | 0 .../packagegroup-citadel-desktop.bb | 0 .../packagegroups/packagegroup-firmware.bb | 0 .../files/primary-user-appimg.path | 0 .../files/primary-user-appimg.service | 0 .../primary-user-appimg/files/primary.nspawn | 0 .../primary-user-appimg/files/run-in-image | 0 .../files/watch-run-user.path | 0 .../files/watch-run-user.service | 0 .../primary-user-appimg.bb | 0 .../systemd-initrd/systemd-initrd_234.bb | 0 .../recipes-devtools/llvm/llvm_git.bbappend | 1 + .../llvm/rust-llvm_%.bbappend | 1 + {meta-foreign => meta-gnome}/COPYING.MIT | 0 .../conf}/include/gnome-3.26.2.inc | 0 .../conf}/include/gnome-3.27.3.inc | 0 meta-gnome/conf/include/gnome-3.27.90.inc | 51 ++++++++++++++++++ .../include/gnome-development-packages.inc | 0 .../conf}/include/gnome-stable-packages.inc | 0 {meta-foreign => meta-gnome}/conf/layer.conf | 9 ++-- .../modemmanager/modemmanager_1.6.10.bb | 0 ...-building-introspection-without-docs.patch | 0 ...reating-libnm-core-tests-directory-f.patch | 0 .../files/watch-resolvconf.path | 0 .../files/watch-resolvconf.service | 0 .../networkmanager/networkmanager.inc | 0 .../networkmanager/networkmanager_1.10.0.bb | 0 .../networkmanager/networkmanager_1.8.4.bb | 0 .../recipes-devtools/autoconf/autoconf213.bb | 0 .../gnome-common/gnome-common_3.18.0.bb | 0 ...1-use-exe-wrapper-for-custom-targets.patch | 0 .../meson/meson/native_bindir.patch | 0 .../recipes-devtools/meson/meson_%.bbappend | 0 .../accountsservice/accountsservice_0.6.45.bb | 0 .../colord-gtk/colord-gtk_0.1.26.bb | 0 .../0001-remove-gobject-introspection.patch | 0 .../colord/colord_1.4.1.bb | 0 .../geoclue/geoclue_2.4.7.bb | 0 .../libgusb/libgusb_0.2.11.bb | 0 .../libxklavier/libxklavier_5.4.bb | 0 .../plymouth/files/plymouthd.conf | 0 .../plymouth/files/subgraph.png | Bin .../plymouth/plymouth_0.9.3.bb | 0 .../50-org.freedesktop.NetworkManager.rules | 0 .../files/50-org.freedesktop.timedate1.rules | 0 .../polkit/files/gtk-doc-check.patch | 0 .../polkit/polkit-gnome_0.105.bb | 0 .../polkit/polkit-group-rule-datetime.bb | 0 .../polkit/polkit-group-rule-network.bb | 0 .../polkit/polkit-group-rule.inc | 0 ...1-make-netgroup-support-configurable.patch | 0 .../polkit/polkit/polkit-1_pam.patch | 0 .../polkit/polkit_0.113.bb | 0 .../pulseaudio/pulseaudio/volatiles.04_pulse | 0 .../pulseaudio/pulseaudio_11.1.bb | 0 .../sound-theme-freedesktop_0.8.bb | 0 .../upower/upower_0.99.7.bb | 0 .../recipes-gnome}/atk/at-spi2-atk_2.26.1.bb | 0 .../recipes-gnome}/atk/at-spi2-core_2.26.2.bb | 0 .../recipes-gnome}/atk/atk_2.26.1.bb | 0 .../recipes-gnome}/caribou/caribou_0.4.21.bb | 0 .../clutter-gtk/clutter-gtk_1.8.4.bb | 0 .../recipes-gnome}/dconf/dconf_0.26.1.bb | 0 ...lace-absolute-path-with-staging-path.patch | 0 .../recipes-gnome}/gdm/files/gdm.conf | 0 .../recipes-gnome}/gdm/gdm.inc | 0 .../recipes-gnome}/gdm/gdm_3.26.2.bb | 0 .../recipes-gnome}/gdm/gdm_3.27.3.bb | 0 .../geocode-glib/geocode-glib_3.25.4.1.bb | 0 .../recipes-gnome}/gjs/gjs.inc | 0 .../recipes-gnome}/gjs/gjs_1.50.2.bb | 0 .../recipes-gnome}/gjs/gjs_1.51.3.bb | 0 .../gnome-autoar/gnome-autoar_0.2.2.bb | 0 .../gnome-backgrounds_3.26.2.bb | 0 .../gnome-bluetooth/gnome-bluetooth_3.26.1.bb | 0 .../gnome-control-center.inc | 0 ...ve-grilo-miner-from-background-panel.patch | 0 .../0002-remove-unwanted-panels.patch | 0 .../0003-disable-running-tests.patch | 0 ...4-remove-unwanted-panel-dependencies.patch | 0 .../0005-fix-gdesktop-prefix.patch | 0 .../gnome-control-center_3.26.1.bb | 0 .../gnome-control-center_3.26.2.bb | 0 .../gnome-desktop/gnome-desktop.inc | 0 ...e.ac-Remove-gnome-common-macro-calls.patch | 0 ...umbnail-don-t-convert-time_t-to-long.patch | 0 .../gnome-desktop/gnome-desktop_3.26.2.bb | 0 .../gnome-desktop/gnome-desktop_3.27.2.bb | 0 .../gnome-keyring/gnome-keyring.inc | 0 .../gnome-keyring/gnome-keyring_3.20.1.bb | 0 .../gnome-keyring/gnome-keyring_3.27.2.bb | 0 .../gnome-session/gnome-session.inc | 0 .../gnome-session/gnome-session_3.26.1.bb | 0 .../gnome-session/gnome-session_3.27.3.bb | 0 .../gnome-settings-daemon.inc | 0 .../gnome-settings-daemon_3.26.1.bb | 0 .../gnome-settings-daemon_3.26.2.bb | 0 .../gnome-shell/gnome-shell.inc | 0 .../0001-do-no-build-calendar-server.patch | 0 ...e-python-path-from-build-environment.patch | 0 .../gnome-shell/gnome-shell_3.26.1.bb | 0 .../gnome-shell/gnome-shell_3.27.1.bb | 0 .../gnome-terminal/files/citadel.desktop | 0 .../gnome-terminal/gnome-terminal.inc | 0 .../gnome-terminal/gnome-terminal_3.26.2.bb | 0 .../gnome-terminal/gnome-terminal_3.27.3.bb | 0 .../gnome-tweak-tool_3.27.3.bb | 0 .../recipes-gnome}/grilo/grilo_0.3.4.bb | 0 .../gsettings-desktop-schemas.inc | 0 .../gsettings-desktop-schemas_3.24.1.bb | 0 .../gsettings-desktop-schemas_3.27.1.bb | 0 .../recipes-gnome}/libgee/libgee_0.20.0.bb | 0 .../recipes-gnome}/libgtop/libgtop_2.38.0.bb | 0 .../libgweather/libgweather_3.26.0.bb | 0 .../mutter/0001-remove-check-for-zenity.patch | 0 .../recipes-gnome}/mutter/mutter_3.26.1.bb | 0 .../0001-meson-find-libm-correctly.patch | 0 .../nautilus/nautilus_3.26.0.bb | 0 .../network-manager-applet.inc | 0 .../network-manager-applet_1.8.4.bb | 0 .../network-manager-applet_1.8.6.bb | 0 .../recipes-gnome}/pango/pango.inc | 0 .../recipes-gnome}/pango/pango_1.40.13.bb | 0 ...qlite-built-threadsafe-and-with-fts5.patch | 0 .../recipes-gnome}/tracker/tracker_2.0.2.bb | 0 .../recipes-gnome}/vte/vte.inc | 0 .../recipes-gnome}/vte/vte_0.50.1.bb | 0 .../recipes-gnome}/vte/vte_0.50.2.bb | 0 .../yelp-tools/yelp-tools_3.18.0.bb | 0 .../yelp-xsl/yelp-xsl_3.20.1.bb | 0 .../recipes-gnome}/zenity/zenity.inc | 0 .../zenity/zenity/0001-Don-t-build-help.patch | 0 .../zenity/0002-Don-t-include-gdialog.patch | 0 .../recipes-gnome}/zenity/zenity_3.24.0.bb | 0 .../recipes-gnome}/zenity/zenity_3.26.0.bb | 0 .../recipes-support}/ibus/ibus_1.5.17.bb | 0 .../recipes-support/itstool/itstool_2.0.4.bb | 0 .../recipes-support}/lcms/lcms_2.9.bb | 0 .../libcanberra/libcanberra_0.30.bb | 0 ...ude-sys-select.h-for-fd_-definitions.patch | 0 .../recipes-support}/libndp/libndp_1.6.bb | 0 .../libpcre/libpcre2_%.bbappend | 0 .../libpwquality/libpwquality_1.4.0.bb | 0 .../libwacom/libwacom_0.26.bb | 0 ...t-character-of-string-to-be-null-or-.patch | 0 ...include-RequiredDefines.h-for-depend.patch | 0 ...7.0.0-fix-the-compile-bug-of-powerpc.patch | 0 .../mozjs/0001-regenerate-configure.patch | 0 ...ve-JS_BYTES_PER_WORD-out-of-config.h.patch | 0 .../mozjs/0003-Add-AArch64-support.patch | 0 ...bug746112-no-decommit-on-large-pages.patch | 0 .../mozjs/mozjs/0005-aarch64-64k-page.patch | 0 ...ix-cross-compilation-on-i586-targets.patch | 0 .../Manually_mmap_heap_memory_esr17.patch | 0 .../fix-the-compile-error-of-powerpc64.patch | 0 .../mozjs/fix_milestone_compile_issue.patch | 0 .../recipes-support}/mozjs/mozjs52.bb | 0 .../0001-do-not-include-RequiredDefines.patch | 0 .../recipes-support}/mozjs/mozjs_17.0.0.bb | 0 .../recipes-support/sqlite/sqlite3_%.bbappend | 0 185 files changed, 60 insertions(+), 7 deletions(-) rename {meta-citadel-distro => meta-citadel}/conf/bblayers.conf.sample (81%) rename {meta-citadel-distro => meta-citadel}/conf/distro/citadel-distro.conf (94%) rename {meta-citadel-distro => meta-citadel}/conf/local.conf.sample (100%) rename {meta-citadel-distro => meta-citadel}/files/citadel-fs-perms.txt (100%) rename {meta-citadel-distro/recipes-core => meta-citadel}/images/citadel-image-base.bb (100%) rename {meta-citadel-distro/recipes-core => meta-citadel}/images/citadel-image-minimal.bb (100%) rename {meta-citadel-distro/recipes-core => meta-citadel}/images/citadel-image.bb (100%) rename {meta-citadel-distro/recipes-core => meta-citadel}/images/citadel-initramfs-image.bb (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/base-files/base-files_%.bbappend (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/base-files/files/00-storage-tmpfiles.conf (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/base-files/files/99-grsec-debootstrap.conf (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/base-files/files/NetworkManager.conf (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/base-files/files/environment.sh (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/base-files/files/fstab (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/base-files/files/locale.conf (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/base-files/files/zram-swap.service (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/citadel-desktop-gsettings/citadel-desktop-gsettings.bb (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/citadel-desktop-gsettings/files/90_citadel.gschema.override (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/citadel-initramfs/citadel-initramfs.bb (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/citadel-initramfs/files/11-dm.rules (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/citadel-initramfs/files/crypttab (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/citadel-initramfs/files/initrd-debug-shell.service (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/citadel-initramfs/files/initrd-release (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/citadel-user/citadel-user.bb (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/mesa/mesa_%.bbappend (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/packagegroups/packagegroup-citadel-base.bb (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/packagegroups/packagegroup-citadel-desktop.bb (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/packagegroups/packagegroup-firmware.bb (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/primary-user-appimg/files/primary-user-appimg.path (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/primary-user-appimg/files/primary-user-appimg.service (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/primary-user-appimg/files/primary.nspawn (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/primary-user-appimg/files/run-in-image (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/primary-user-appimg/files/watch-run-user.path (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/primary-user-appimg/files/watch-run-user.service (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/primary-user-appimg/primary-user-appimg.bb (100%) rename {meta-citadel-distro => meta-citadel}/recipes-core/systemd-initrd/systemd-initrd_234.bb (100%) create mode 100644 meta-citadel/recipes-devtools/llvm/llvm_git.bbappend create mode 100644 meta-citadel/recipes-devtools/llvm/rust-llvm_%.bbappend rename {meta-foreign => meta-gnome}/COPYING.MIT (100%) rename {meta-citadel-distro/conf/distro => meta-gnome/conf}/include/gnome-3.26.2.inc (100%) rename {meta-citadel-distro/conf/distro => meta-gnome/conf}/include/gnome-3.27.3.inc (100%) create mode 100644 meta-gnome/conf/include/gnome-3.27.90.inc rename {meta-citadel-distro/conf/distro => meta-gnome/conf}/include/gnome-development-packages.inc (100%) rename {meta-citadel-distro/conf/distro => meta-gnome/conf}/include/gnome-stable-packages.inc (100%) rename {meta-foreign => meta-gnome}/conf/layer.conf (52%) rename {meta-citadel => meta-gnome}/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb (100%) rename {meta-citadel => meta-gnome}/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch (100%) rename {meta-citadel => meta-gnome}/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch (100%) rename {meta-citadel => meta-gnome}/recipes-connectivity/networkmanager/files/watch-resolvconf.path (100%) rename {meta-citadel => meta-gnome}/recipes-connectivity/networkmanager/files/watch-resolvconf.service (100%) rename {meta-citadel => meta-gnome}/recipes-connectivity/networkmanager/networkmanager.inc (100%) rename {meta-citadel => meta-gnome}/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb (100%) rename {meta-citadel => meta-gnome}/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb (100%) rename {meta-citadel => meta-gnome}/recipes-devtools/autoconf/autoconf213.bb (100%) rename {meta-foreign/recipes-gnome => meta-gnome/recipes-devtools}/gnome-common/gnome-common_3.18.0.bb (100%) rename {meta-citadel => meta-gnome}/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch (100%) rename {meta-citadel => meta-gnome}/recipes-devtools/meson/meson/native_bindir.patch (100%) rename {meta-citadel => meta-gnome}/recipes-devtools/meson/meson_%.bbappend (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/accountsservice/accountsservice_0.6.45.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/colord-gtk/colord-gtk_0.1.26.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/colord/colord/0001-remove-gobject-introspection.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/colord/colord_1.4.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/geoclue/geoclue_2.4.7.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/libgusb/libgusb_0.2.11.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/libxklavier/libxklavier_5.4.bb (100%) rename {meta-citadel/recipes-support => meta-gnome/recipes-freedesktop}/plymouth/files/plymouthd.conf (100%) rename {meta-citadel/recipes-support => meta-gnome/recipes-freedesktop}/plymouth/files/subgraph.png (100%) rename {meta-citadel/recipes-support => meta-gnome/recipes-freedesktop}/plymouth/plymouth_0.9.3.bb (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/files/50-org.freedesktop.NetworkManager.rules (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/files/50-org.freedesktop.timedate1.rules (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/files/gtk-doc-check.patch (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/polkit-gnome_0.105.bb (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/polkit-group-rule-datetime.bb (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/polkit-group-rule-network.bb (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/polkit-group-rule.inc (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/polkit/0001-make-netgroup-support-configurable.patch (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/polkit/polkit-1_pam.patch (100%) rename {meta-foreign/recipes-extended => meta-gnome/recipes-freedesktop}/polkit/polkit_0.113.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/pulseaudio/pulseaudio/volatiles.04_pulse (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/pulseaudio/pulseaudio_11.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-freedesktop}/upower/upower_0.99.7.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/atk/at-spi2-atk_2.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/atk/at-spi2-core_2.26.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/atk/atk_2.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/caribou/caribou_0.4.21.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/clutter-gtk/clutter-gtk_1.8.4.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/dconf/dconf_0.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gdm/files/0001-replace-absolute-path-with-staging-path.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gdm/files/gdm.conf (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gdm/gdm.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gdm/gdm_3.26.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gdm/gdm_3.27.3.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/geocode-glib/geocode-glib_3.25.4.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gjs/gjs.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gjs/gjs_1.50.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gjs/gjs_1.51.3.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-autoar/gnome-autoar_0.2.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-backgrounds/gnome-backgrounds_3.26.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-bluetooth/gnome-bluetooth_3.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-control-center/gnome-control-center.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-control-center/gnome-control-center_3.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-control-center/gnome-control-center_3.26.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-desktop/gnome-desktop.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-desktop/gnome-desktop_3.26.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-desktop/gnome-desktop_3.27.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-keyring/gnome-keyring.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-keyring/gnome-keyring_3.20.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-keyring/gnome-keyring_3.27.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-session/gnome-session.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-session/gnome-session_3.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-session/gnome-session_3.27.3.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-settings-daemon/gnome-settings-daemon.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-shell/gnome-shell.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-shell/gnome-shell_3.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-shell/gnome-shell_3.27.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-terminal/files/citadel.desktop (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-terminal/gnome-terminal.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-terminal/gnome-terminal_3.26.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-terminal/gnome-terminal_3.27.3.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/grilo/grilo_0.3.4.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gsettings-desktop-schema/gsettings-desktop-schemas.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gsettings-desktop-schema/gsettings-desktop-schemas_3.24.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/gsettings-desktop-schema/gsettings-desktop-schemas_3.27.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/libgee/libgee_0.20.0.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/libgtop/libgtop_2.38.0.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/libgweather/libgweather_3.26.0.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/mutter/mutter/0001-remove-check-for-zenity.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/mutter/mutter_3.26.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/nautilus/nautilus/0001-meson-find-libm-correctly.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/nautilus/nautilus_3.26.0.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/network-manager-applet/network-manager-applet.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/network-manager-applet/network-manager-applet_1.8.4.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/network-manager-applet/network-manager-applet_1.8.6.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/pango/pango.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/pango/pango_1.40.13.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/tracker/tracker_2.0.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/vte/vte.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/vte/vte_0.50.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/vte/vte_0.50.2.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/yelp-tools/yelp-tools_3.18.0.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/yelp-xsl/yelp-xsl_3.20.1.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/zenity/zenity.inc (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/zenity/zenity/0001-Don-t-build-help.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/zenity/zenity/0002-Don-t-include-gdialog.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/zenity/zenity_3.24.0.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-gnome}/zenity/zenity_3.26.0.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/ibus/ibus_1.5.17.bb (100%) rename {meta-citadel => meta-gnome}/recipes-support/itstool/itstool_2.0.4.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/lcms/lcms_2.9.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/libcanberra/libcanberra_0.30.bb (100%) rename {meta-foreign/recipes-connectivity => meta-gnome/recipes-support}/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch (100%) rename {meta-foreign/recipes-connectivity => meta-gnome/recipes-support}/libndp/libndp_1.6.bb (100%) rename {meta-citadel => meta-gnome}/recipes-support/libpcre/libpcre2_%.bbappend (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/libpwquality/libpwquality_1.4.0.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/libwacom/libwacom_0.26.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0001-regenerate-configure.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0003-Add-AArch64-support.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0005-aarch64-64k-page.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs/fix_milestone_compile_issue.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs52.bb (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch (100%) rename {meta-citadel/recipes-desktop => meta-gnome/recipes-support}/mozjs/mozjs_17.0.0.bb (100%) rename {meta-citadel => meta-gnome}/recipes-support/sqlite/sqlite3_%.bbappend (100%) diff --git a/meta-citadel-distro/conf/bblayers.conf.sample b/meta-citadel/conf/bblayers.conf.sample similarity index 81% rename from meta-citadel-distro/conf/bblayers.conf.sample rename to meta-citadel/conf/bblayers.conf.sample index edaf59b..0960ccc 100644 --- a/meta-citadel-distro/conf/bblayers.conf.sample +++ b/meta-citadel/conf/bblayers.conf.sample @@ -10,6 +10,5 @@ BBLAYERS ?= " \ ##OEROOT##/../meta-intel \ ##OEROOT##/../meta-rust \ ##OEROOT##/../meta-citadel \ - ##OEROOT##/../meta-citadel-distro \ - ##OEROOT##/../meta-foreign \ + ##OEROOT##/../meta-gnome \ " diff --git a/meta-citadel-distro/conf/distro/citadel-distro.conf b/meta-citadel/conf/distro/citadel-distro.conf similarity index 94% rename from meta-citadel-distro/conf/distro/citadel-distro.conf rename to meta-citadel/conf/distro/citadel-distro.conf index 62f4904..aa741b4 100644 --- a/meta-citadel-distro/conf/distro/citadel-distro.conf +++ b/meta-citadel/conf/distro/citadel-distro.conf @@ -5,8 +5,6 @@ DISTRO_VERSION = "1.0" CITADEL_DEFAULT_DISTRO_FEATURES = "acl alsa argp bluetooth ext2 largefile systemd usbhost wifi xattr pci x11 usrmerge wayland opengl pam" DISTRO_FEATURES ?= "${DISTRO_FEATURES_LIBC} ${CITADEL_DEFAULT_DISTRO_FEATURES}" -GNOME_RELEASE ?= "stable" -require conf/distro/include/gnome-${GNOME_RELEASE}-packages.inc HOSTTOOLS_NONFATAL += "inkscape" # diff --git a/meta-citadel-distro/conf/local.conf.sample b/meta-citadel/conf/local.conf.sample similarity index 100% rename from meta-citadel-distro/conf/local.conf.sample rename to meta-citadel/conf/local.conf.sample diff --git a/meta-citadel-distro/files/citadel-fs-perms.txt b/meta-citadel/files/citadel-fs-perms.txt similarity index 100% rename from meta-citadel-distro/files/citadel-fs-perms.txt rename to meta-citadel/files/citadel-fs-perms.txt diff --git a/meta-citadel-distro/recipes-core/images/citadel-image-base.bb b/meta-citadel/images/citadel-image-base.bb similarity index 100% rename from meta-citadel-distro/recipes-core/images/citadel-image-base.bb rename to meta-citadel/images/citadel-image-base.bb diff --git a/meta-citadel-distro/recipes-core/images/citadel-image-minimal.bb b/meta-citadel/images/citadel-image-minimal.bb similarity index 100% rename from meta-citadel-distro/recipes-core/images/citadel-image-minimal.bb rename to meta-citadel/images/citadel-image-minimal.bb diff --git a/meta-citadel-distro/recipes-core/images/citadel-image.bb b/meta-citadel/images/citadel-image.bb similarity index 100% rename from meta-citadel-distro/recipes-core/images/citadel-image.bb rename to meta-citadel/images/citadel-image.bb diff --git a/meta-citadel-distro/recipes-core/images/citadel-initramfs-image.bb b/meta-citadel/images/citadel-initramfs-image.bb similarity index 100% rename from meta-citadel-distro/recipes-core/images/citadel-initramfs-image.bb rename to meta-citadel/images/citadel-initramfs-image.bb diff --git a/meta-citadel-distro/recipes-core/base-files/base-files_%.bbappend b/meta-citadel/recipes-core/base-files/base-files_%.bbappend similarity index 100% rename from meta-citadel-distro/recipes-core/base-files/base-files_%.bbappend rename to meta-citadel/recipes-core/base-files/base-files_%.bbappend diff --git a/meta-citadel-distro/recipes-core/base-files/files/00-storage-tmpfiles.conf b/meta-citadel/recipes-core/base-files/files/00-storage-tmpfiles.conf similarity index 100% rename from meta-citadel-distro/recipes-core/base-files/files/00-storage-tmpfiles.conf rename to meta-citadel/recipes-core/base-files/files/00-storage-tmpfiles.conf diff --git a/meta-citadel-distro/recipes-core/base-files/files/99-grsec-debootstrap.conf b/meta-citadel/recipes-core/base-files/files/99-grsec-debootstrap.conf similarity index 100% rename from meta-citadel-distro/recipes-core/base-files/files/99-grsec-debootstrap.conf rename to meta-citadel/recipes-core/base-files/files/99-grsec-debootstrap.conf diff --git a/meta-citadel-distro/recipes-core/base-files/files/NetworkManager.conf b/meta-citadel/recipes-core/base-files/files/NetworkManager.conf similarity index 100% rename from meta-citadel-distro/recipes-core/base-files/files/NetworkManager.conf rename to meta-citadel/recipes-core/base-files/files/NetworkManager.conf diff --git a/meta-citadel-distro/recipes-core/base-files/files/environment.sh b/meta-citadel/recipes-core/base-files/files/environment.sh similarity index 100% rename from meta-citadel-distro/recipes-core/base-files/files/environment.sh rename to meta-citadel/recipes-core/base-files/files/environment.sh diff --git a/meta-citadel-distro/recipes-core/base-files/files/fstab b/meta-citadel/recipes-core/base-files/files/fstab similarity index 100% rename from meta-citadel-distro/recipes-core/base-files/files/fstab rename to meta-citadel/recipes-core/base-files/files/fstab diff --git a/meta-citadel-distro/recipes-core/base-files/files/locale.conf b/meta-citadel/recipes-core/base-files/files/locale.conf similarity index 100% rename from meta-citadel-distro/recipes-core/base-files/files/locale.conf rename to meta-citadel/recipes-core/base-files/files/locale.conf diff --git a/meta-citadel-distro/recipes-core/base-files/files/zram-swap.service b/meta-citadel/recipes-core/base-files/files/zram-swap.service similarity index 100% rename from meta-citadel-distro/recipes-core/base-files/files/zram-swap.service rename to meta-citadel/recipes-core/base-files/files/zram-swap.service diff --git a/meta-citadel-distro/recipes-core/citadel-desktop-gsettings/citadel-desktop-gsettings.bb b/meta-citadel/recipes-core/citadel-desktop-gsettings/citadel-desktop-gsettings.bb similarity index 100% rename from meta-citadel-distro/recipes-core/citadel-desktop-gsettings/citadel-desktop-gsettings.bb rename to meta-citadel/recipes-core/citadel-desktop-gsettings/citadel-desktop-gsettings.bb diff --git a/meta-citadel-distro/recipes-core/citadel-desktop-gsettings/files/90_citadel.gschema.override b/meta-citadel/recipes-core/citadel-desktop-gsettings/files/90_citadel.gschema.override similarity index 100% rename from meta-citadel-distro/recipes-core/citadel-desktop-gsettings/files/90_citadel.gschema.override rename to meta-citadel/recipes-core/citadel-desktop-gsettings/files/90_citadel.gschema.override diff --git a/meta-citadel-distro/recipes-core/citadel-initramfs/citadel-initramfs.bb b/meta-citadel/recipes-core/citadel-initramfs/citadel-initramfs.bb similarity index 100% rename from meta-citadel-distro/recipes-core/citadel-initramfs/citadel-initramfs.bb rename to meta-citadel/recipes-core/citadel-initramfs/citadel-initramfs.bb diff --git a/meta-citadel-distro/recipes-core/citadel-initramfs/files/11-dm.rules b/meta-citadel/recipes-core/citadel-initramfs/files/11-dm.rules similarity index 100% rename from meta-citadel-distro/recipes-core/citadel-initramfs/files/11-dm.rules rename to meta-citadel/recipes-core/citadel-initramfs/files/11-dm.rules diff --git a/meta-citadel-distro/recipes-core/citadel-initramfs/files/crypttab b/meta-citadel/recipes-core/citadel-initramfs/files/crypttab similarity index 100% rename from meta-citadel-distro/recipes-core/citadel-initramfs/files/crypttab rename to meta-citadel/recipes-core/citadel-initramfs/files/crypttab diff --git a/meta-citadel-distro/recipes-core/citadel-initramfs/files/initrd-debug-shell.service b/meta-citadel/recipes-core/citadel-initramfs/files/initrd-debug-shell.service similarity index 100% rename from meta-citadel-distro/recipes-core/citadel-initramfs/files/initrd-debug-shell.service rename to meta-citadel/recipes-core/citadel-initramfs/files/initrd-debug-shell.service diff --git a/meta-citadel-distro/recipes-core/citadel-initramfs/files/initrd-release b/meta-citadel/recipes-core/citadel-initramfs/files/initrd-release similarity index 100% rename from meta-citadel-distro/recipes-core/citadel-initramfs/files/initrd-release rename to meta-citadel/recipes-core/citadel-initramfs/files/initrd-release diff --git a/meta-citadel-distro/recipes-core/citadel-user/citadel-user.bb b/meta-citadel/recipes-core/citadel-user/citadel-user.bb similarity index 100% rename from meta-citadel-distro/recipes-core/citadel-user/citadel-user.bb rename to meta-citadel/recipes-core/citadel-user/citadel-user.bb diff --git a/meta-citadel-distro/recipes-core/mesa/mesa_%.bbappend b/meta-citadel/recipes-core/mesa/mesa_%.bbappend similarity index 100% rename from meta-citadel-distro/recipes-core/mesa/mesa_%.bbappend rename to meta-citadel/recipes-core/mesa/mesa_%.bbappend diff --git a/meta-citadel-distro/recipes-core/packagegroups/packagegroup-citadel-base.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb similarity index 100% rename from meta-citadel-distro/recipes-core/packagegroups/packagegroup-citadel-base.bb rename to meta-citadel/recipes-core/packagegroups/packagegroup-citadel-base.bb diff --git a/meta-citadel-distro/recipes-core/packagegroups/packagegroup-citadel-desktop.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb similarity index 100% rename from meta-citadel-distro/recipes-core/packagegroups/packagegroup-citadel-desktop.bb rename to meta-citadel/recipes-core/packagegroups/packagegroup-citadel-desktop.bb diff --git a/meta-citadel-distro/recipes-core/packagegroups/packagegroup-firmware.bb b/meta-citadel/recipes-core/packagegroups/packagegroup-firmware.bb similarity index 100% rename from meta-citadel-distro/recipes-core/packagegroups/packagegroup-firmware.bb rename to meta-citadel/recipes-core/packagegroups/packagegroup-firmware.bb diff --git a/meta-citadel-distro/recipes-core/primary-user-appimg/files/primary-user-appimg.path b/meta-citadel/recipes-core/primary-user-appimg/files/primary-user-appimg.path similarity index 100% rename from meta-citadel-distro/recipes-core/primary-user-appimg/files/primary-user-appimg.path rename to meta-citadel/recipes-core/primary-user-appimg/files/primary-user-appimg.path diff --git a/meta-citadel-distro/recipes-core/primary-user-appimg/files/primary-user-appimg.service b/meta-citadel/recipes-core/primary-user-appimg/files/primary-user-appimg.service similarity index 100% rename from meta-citadel-distro/recipes-core/primary-user-appimg/files/primary-user-appimg.service rename to meta-citadel/recipes-core/primary-user-appimg/files/primary-user-appimg.service diff --git a/meta-citadel-distro/recipes-core/primary-user-appimg/files/primary.nspawn b/meta-citadel/recipes-core/primary-user-appimg/files/primary.nspawn similarity index 100% rename from meta-citadel-distro/recipes-core/primary-user-appimg/files/primary.nspawn rename to meta-citadel/recipes-core/primary-user-appimg/files/primary.nspawn diff --git a/meta-citadel-distro/recipes-core/primary-user-appimg/files/run-in-image b/meta-citadel/recipes-core/primary-user-appimg/files/run-in-image similarity index 100% rename from meta-citadel-distro/recipes-core/primary-user-appimg/files/run-in-image rename to meta-citadel/recipes-core/primary-user-appimg/files/run-in-image diff --git a/meta-citadel-distro/recipes-core/primary-user-appimg/files/watch-run-user.path b/meta-citadel/recipes-core/primary-user-appimg/files/watch-run-user.path similarity index 100% rename from meta-citadel-distro/recipes-core/primary-user-appimg/files/watch-run-user.path rename to meta-citadel/recipes-core/primary-user-appimg/files/watch-run-user.path diff --git a/meta-citadel-distro/recipes-core/primary-user-appimg/files/watch-run-user.service b/meta-citadel/recipes-core/primary-user-appimg/files/watch-run-user.service similarity index 100% rename from meta-citadel-distro/recipes-core/primary-user-appimg/files/watch-run-user.service rename to meta-citadel/recipes-core/primary-user-appimg/files/watch-run-user.service diff --git a/meta-citadel-distro/recipes-core/primary-user-appimg/primary-user-appimg.bb b/meta-citadel/recipes-core/primary-user-appimg/primary-user-appimg.bb similarity index 100% rename from meta-citadel-distro/recipes-core/primary-user-appimg/primary-user-appimg.bb rename to meta-citadel/recipes-core/primary-user-appimg/primary-user-appimg.bb diff --git a/meta-citadel-distro/recipes-core/systemd-initrd/systemd-initrd_234.bb b/meta-citadel/recipes-core/systemd-initrd/systemd-initrd_234.bb similarity index 100% rename from meta-citadel-distro/recipes-core/systemd-initrd/systemd-initrd_234.bb rename to meta-citadel/recipes-core/systemd-initrd/systemd-initrd_234.bb diff --git a/meta-citadel/recipes-devtools/llvm/llvm_git.bbappend b/meta-citadel/recipes-devtools/llvm/llvm_git.bbappend new file mode 100644 index 0000000..bc056b5 --- /dev/null +++ b/meta-citadel/recipes-devtools/llvm/llvm_git.bbappend @@ -0,0 +1 @@ +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=MinSizeRel " diff --git a/meta-citadel/recipes-devtools/llvm/rust-llvm_%.bbappend b/meta-citadel/recipes-devtools/llvm/rust-llvm_%.bbappend new file mode 100644 index 0000000..bc056b5 --- /dev/null +++ b/meta-citadel/recipes-devtools/llvm/rust-llvm_%.bbappend @@ -0,0 +1 @@ +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=MinSizeRel " diff --git a/meta-foreign/COPYING.MIT b/meta-gnome/COPYING.MIT similarity index 100% rename from meta-foreign/COPYING.MIT rename to meta-gnome/COPYING.MIT diff --git a/meta-citadel-distro/conf/distro/include/gnome-3.26.2.inc b/meta-gnome/conf/include/gnome-3.26.2.inc similarity index 100% rename from meta-citadel-distro/conf/distro/include/gnome-3.26.2.inc rename to meta-gnome/conf/include/gnome-3.26.2.inc diff --git a/meta-citadel-distro/conf/distro/include/gnome-3.27.3.inc b/meta-gnome/conf/include/gnome-3.27.3.inc similarity index 100% rename from meta-citadel-distro/conf/distro/include/gnome-3.27.3.inc rename to meta-gnome/conf/include/gnome-3.27.3.inc diff --git a/meta-gnome/conf/include/gnome-3.27.90.inc b/meta-gnome/conf/include/gnome-3.27.90.inc new file mode 100644 index 0000000..60b5b87 --- /dev/null +++ b/meta-gnome/conf/include/gnome-3.27.90.inc @@ -0,0 +1,51 @@ +# 3.27.90 + +PREFERRED_VERSION_adwaita-icon-theme = "3.27.90" +PREFERRED_VERSION_atk = "2.27.1" +PREFERRED_VERSION_caribou = "0.4.21" +PREFERRED_VERSION_clutter = "1.26.2" +PREFERRED_VERSION_clutter-gtk = "1.8.4" +PREFERRED_VERSION_cogl = "1.22.2" +PREFERRED_VERSION_dconf = "0.27.1" +PREFERRED_VERSION_gcr = "3.27.4" +PREFERRED_VERSION_gdk-pixbuf = "2.36.11" +PREFERRED_VERSION_gdm = "3.27.90" +PREFERRED_VERSION_geocode-glib = "3.25.4.1" +PREFERRED_VERSION_gjs = "1.51.90" +PREFERRED_VERSION_glib = "2.55.2" +PREFERRED_VERSION_glib-networking = "2.55.90" +PREFERRED_VERSION_gnome-backgrounds = "3.27.90" +PREFERRED_VERSION_gnome-bluetooth = "3.26.1" +PREFERRED_VERSION_gnome-color-manager = "3.26.0" +PREFERRED_VERSION_gnome-control-center = "3.27.90" +PREFERRED_VERSION_gnome-desktop = "3.27.90" +PREFERRED_VERSION_gnome-keyring = "3.27.4" +PREFERRED_VERSION_gnome-menus = "3.13.3" +PREFERRED_VERSION_gnome-session = "3.27.90" +PREFERRED_VERSION_gnome-settings-daemon = "3.27.90" +PREFERRED_VERSION_gnome-shell = "3.27.1" +PREFERRED_VERSION_gnome-system-monitor = "3.27.90" +PREFERRED_VERSION_gnome-terminal = "3.27.90" +PREFERRED_VERSION_gnome-themes-standard = "3.22.3" +PREFERRED_VERSION_gsettings-desktop-schemas = "3.27.90" +PREFERRED_VERSION_gtk+3 = "3.22.26" +PREFERRED_VERSION_libcroco = "0.6.12" +PREFERRED_VERSION_libgee = "0.20.1" +PREFERRED_VERSION_libgtop = "2.38.0" +PREFERRED_VERSION_libgweather = "3.27.4" +PREFERRED_VERSION_libnotify = "0.7.7" +PREFERRED_VERSION_librsvg = "2.42.2" +PREFERRED_VERSION_libsecret = "0.18.5" +PREFERRED_VERSION_libsoup = "2.61.90" +PREFERRED_VERSION_mutter = "3.27.1" +PREFERRED_VERSION_nautilus = "3.27.90" +PREFERRED_VERSION_networkmanager = "1.10.4" +PREFERRED_VERSION_network-manager-applet = "1.8.10" +PREFERRED_VERSION_pango = "1.41.1" +PREFERRED_VERSION_pygobject = "3.27.4" +PREFERRED_VERSION_vala = "0.39.91" +PREFERRED_VERSION_vte = "0.51.3" +PREFERRED_VERSION_yelp = "3.27.1" +PREFERRED_VERSION_yelp-xsl = "3.27.90" +PREFERRED_VERSION_yelp-tools = "3.27.90" +PREFERRED_VERSION_zenity = "3.27.90" diff --git a/meta-citadel-distro/conf/distro/include/gnome-development-packages.inc b/meta-gnome/conf/include/gnome-development-packages.inc similarity index 100% rename from meta-citadel-distro/conf/distro/include/gnome-development-packages.inc rename to meta-gnome/conf/include/gnome-development-packages.inc diff --git a/meta-citadel-distro/conf/distro/include/gnome-stable-packages.inc b/meta-gnome/conf/include/gnome-stable-packages.inc similarity index 100% rename from meta-citadel-distro/conf/distro/include/gnome-stable-packages.inc rename to meta-gnome/conf/include/gnome-stable-packages.inc diff --git a/meta-foreign/conf/layer.conf b/meta-gnome/conf/layer.conf similarity index 52% rename from meta-foreign/conf/layer.conf rename to meta-gnome/conf/layer.conf index 00972db..af77786 100644 --- a/meta-foreign/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -5,6 +5,9 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \\ ${LAYERDIR}/recipes-*/*/*.bbappend" -BBFILE_COLLECTIONS += "meta-foreign" -BBFILE_PATTERN_meta-foreign = "^${LAYERDIR}/" -BBFILE_PRIORITY_meta-foreign = "6" +BBFILE_COLLECTIONS += "meta-gnome" +BBFILE_PATTERN_meta-gnome = "^${LAYERDIR}/" +BBFILE_PRIORITY_meta-gnome = "6" + +GNOME_RELEASE ?= "stable" +require conf/include/gnome-${GNOME_RELEASE}-packages.inc diff --git a/meta-citadel/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb similarity index 100% rename from meta-citadel/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb rename to meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.6.10.bb diff --git a/meta-citadel/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch b/meta-gnome/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch similarity index 100% rename from meta-citadel/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch rename to meta-gnome/recipes-connectivity/networkmanager/files/0001-allow-building-introspection-without-docs.patch diff --git a/meta-citadel/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch b/meta-gnome/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch similarity index 100% rename from meta-citadel/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch rename to meta-gnome/recipes-connectivity/networkmanager/files/0001-build-fix-race-creating-libnm-core-tests-directory-f.patch diff --git a/meta-citadel/recipes-connectivity/networkmanager/files/watch-resolvconf.path b/meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.path similarity index 100% rename from meta-citadel/recipes-connectivity/networkmanager/files/watch-resolvconf.path rename to meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.path diff --git a/meta-citadel/recipes-connectivity/networkmanager/files/watch-resolvconf.service b/meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.service similarity index 100% rename from meta-citadel/recipes-connectivity/networkmanager/files/watch-resolvconf.service rename to meta-gnome/recipes-connectivity/networkmanager/files/watch-resolvconf.service diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager.inc b/meta-gnome/recipes-connectivity/networkmanager/networkmanager.inc similarity index 100% rename from meta-citadel/recipes-connectivity/networkmanager/networkmanager.inc rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager.inc diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb similarity index 100% rename from meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.10.0.bb diff --git a/meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb similarity index 100% rename from meta-citadel/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb rename to meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.8.4.bb diff --git a/meta-citadel/recipes-devtools/autoconf/autoconf213.bb b/meta-gnome/recipes-devtools/autoconf/autoconf213.bb similarity index 100% rename from meta-citadel/recipes-devtools/autoconf/autoconf213.bb rename to meta-gnome/recipes-devtools/autoconf/autoconf213.bb diff --git a/meta-foreign/recipes-gnome/gnome-common/gnome-common_3.18.0.bb b/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb similarity index 100% rename from meta-foreign/recipes-gnome/gnome-common/gnome-common_3.18.0.bb rename to meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb diff --git a/meta-citadel/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch b/meta-gnome/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch similarity index 100% rename from meta-citadel/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch rename to meta-gnome/recipes-devtools/meson/meson/0001-use-exe-wrapper-for-custom-targets.patch diff --git a/meta-citadel/recipes-devtools/meson/meson/native_bindir.patch b/meta-gnome/recipes-devtools/meson/meson/native_bindir.patch similarity index 100% rename from meta-citadel/recipes-devtools/meson/meson/native_bindir.patch rename to meta-gnome/recipes-devtools/meson/meson/native_bindir.patch diff --git a/meta-citadel/recipes-devtools/meson/meson_%.bbappend b/meta-gnome/recipes-devtools/meson/meson_%.bbappend similarity index 100% rename from meta-citadel/recipes-devtools/meson/meson_%.bbappend rename to meta-gnome/recipes-devtools/meson/meson_%.bbappend diff --git a/meta-citadel/recipes-desktop/accountsservice/accountsservice_0.6.45.bb b/meta-gnome/recipes-freedesktop/accountsservice/accountsservice_0.6.45.bb similarity index 100% rename from meta-citadel/recipes-desktop/accountsservice/accountsservice_0.6.45.bb rename to meta-gnome/recipes-freedesktop/accountsservice/accountsservice_0.6.45.bb diff --git a/meta-citadel/recipes-desktop/colord-gtk/colord-gtk_0.1.26.bb b/meta-gnome/recipes-freedesktop/colord-gtk/colord-gtk_0.1.26.bb similarity index 100% rename from meta-citadel/recipes-desktop/colord-gtk/colord-gtk_0.1.26.bb rename to meta-gnome/recipes-freedesktop/colord-gtk/colord-gtk_0.1.26.bb diff --git a/meta-citadel/recipes-desktop/colord/colord/0001-remove-gobject-introspection.patch b/meta-gnome/recipes-freedesktop/colord/colord/0001-remove-gobject-introspection.patch similarity index 100% rename from meta-citadel/recipes-desktop/colord/colord/0001-remove-gobject-introspection.patch rename to meta-gnome/recipes-freedesktop/colord/colord/0001-remove-gobject-introspection.patch diff --git a/meta-citadel/recipes-desktop/colord/colord_1.4.1.bb b/meta-gnome/recipes-freedesktop/colord/colord_1.4.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/colord/colord_1.4.1.bb rename to meta-gnome/recipes-freedesktop/colord/colord_1.4.1.bb diff --git a/meta-citadel/recipes-desktop/geoclue/geoclue_2.4.7.bb b/meta-gnome/recipes-freedesktop/geoclue/geoclue_2.4.7.bb similarity index 100% rename from meta-citadel/recipes-desktop/geoclue/geoclue_2.4.7.bb rename to meta-gnome/recipes-freedesktop/geoclue/geoclue_2.4.7.bb diff --git a/meta-citadel/recipes-desktop/libgusb/libgusb_0.2.11.bb b/meta-gnome/recipes-freedesktop/libgusb/libgusb_0.2.11.bb similarity index 100% rename from meta-citadel/recipes-desktop/libgusb/libgusb_0.2.11.bb rename to meta-gnome/recipes-freedesktop/libgusb/libgusb_0.2.11.bb diff --git a/meta-citadel/recipes-desktop/libxklavier/libxklavier_5.4.bb b/meta-gnome/recipes-freedesktop/libxklavier/libxklavier_5.4.bb similarity index 100% rename from meta-citadel/recipes-desktop/libxklavier/libxklavier_5.4.bb rename to meta-gnome/recipes-freedesktop/libxklavier/libxklavier_5.4.bb diff --git a/meta-citadel/recipes-support/plymouth/files/plymouthd.conf b/meta-gnome/recipes-freedesktop/plymouth/files/plymouthd.conf similarity index 100% rename from meta-citadel/recipes-support/plymouth/files/plymouthd.conf rename to meta-gnome/recipes-freedesktop/plymouth/files/plymouthd.conf diff --git a/meta-citadel/recipes-support/plymouth/files/subgraph.png b/meta-gnome/recipes-freedesktop/plymouth/files/subgraph.png similarity index 100% rename from meta-citadel/recipes-support/plymouth/files/subgraph.png rename to meta-gnome/recipes-freedesktop/plymouth/files/subgraph.png diff --git a/meta-citadel/recipes-support/plymouth/plymouth_0.9.3.bb b/meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.3.bb similarity index 100% rename from meta-citadel/recipes-support/plymouth/plymouth_0.9.3.bb rename to meta-gnome/recipes-freedesktop/plymouth/plymouth_0.9.3.bb diff --git a/meta-foreign/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules b/meta-gnome/recipes-freedesktop/polkit/files/50-org.freedesktop.NetworkManager.rules similarity index 100% rename from meta-foreign/recipes-extended/polkit/files/50-org.freedesktop.NetworkManager.rules rename to meta-gnome/recipes-freedesktop/polkit/files/50-org.freedesktop.NetworkManager.rules diff --git a/meta-foreign/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules b/meta-gnome/recipes-freedesktop/polkit/files/50-org.freedesktop.timedate1.rules similarity index 100% rename from meta-foreign/recipes-extended/polkit/files/50-org.freedesktop.timedate1.rules rename to meta-gnome/recipes-freedesktop/polkit/files/50-org.freedesktop.timedate1.rules diff --git a/meta-foreign/recipes-extended/polkit/files/gtk-doc-check.patch b/meta-gnome/recipes-freedesktop/polkit/files/gtk-doc-check.patch similarity index 100% rename from meta-foreign/recipes-extended/polkit/files/gtk-doc-check.patch rename to meta-gnome/recipes-freedesktop/polkit/files/gtk-doc-check.patch diff --git a/meta-foreign/recipes-extended/polkit/polkit-gnome_0.105.bb b/meta-gnome/recipes-freedesktop/polkit/polkit-gnome_0.105.bb similarity index 100% rename from meta-foreign/recipes-extended/polkit/polkit-gnome_0.105.bb rename to meta-gnome/recipes-freedesktop/polkit/polkit-gnome_0.105.bb diff --git a/meta-foreign/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-datetime.bb similarity index 100% rename from meta-foreign/recipes-extended/polkit/polkit-group-rule-datetime.bb rename to meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-datetime.bb diff --git a/meta-foreign/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-network.bb similarity index 100% rename from meta-foreign/recipes-extended/polkit/polkit-group-rule-network.bb rename to meta-gnome/recipes-freedesktop/polkit/polkit-group-rule-network.bb diff --git a/meta-foreign/recipes-extended/polkit/polkit-group-rule.inc b/meta-gnome/recipes-freedesktop/polkit/polkit-group-rule.inc similarity index 100% rename from meta-foreign/recipes-extended/polkit/polkit-group-rule.inc rename to meta-gnome/recipes-freedesktop/polkit/polkit-group-rule.inc diff --git a/meta-foreign/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch b/meta-gnome/recipes-freedesktop/polkit/polkit/0001-make-netgroup-support-configurable.patch similarity index 100% rename from meta-foreign/recipes-extended/polkit/polkit/0001-make-netgroup-support-configurable.patch rename to meta-gnome/recipes-freedesktop/polkit/polkit/0001-make-netgroup-support-configurable.patch diff --git a/meta-foreign/recipes-extended/polkit/polkit/polkit-1_pam.patch b/meta-gnome/recipes-freedesktop/polkit/polkit/polkit-1_pam.patch similarity index 100% rename from meta-foreign/recipes-extended/polkit/polkit/polkit-1_pam.patch rename to meta-gnome/recipes-freedesktop/polkit/polkit/polkit-1_pam.patch diff --git a/meta-foreign/recipes-extended/polkit/polkit_0.113.bb b/meta-gnome/recipes-freedesktop/polkit/polkit_0.113.bb similarity index 100% rename from meta-foreign/recipes-extended/polkit/polkit_0.113.bb rename to meta-gnome/recipes-freedesktop/polkit/polkit_0.113.bb diff --git a/meta-citadel/recipes-desktop/pulseaudio/pulseaudio/volatiles.04_pulse b/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/volatiles.04_pulse similarity index 100% rename from meta-citadel/recipes-desktop/pulseaudio/pulseaudio/volatiles.04_pulse rename to meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio/volatiles.04_pulse diff --git a/meta-citadel/recipes-desktop/pulseaudio/pulseaudio_11.1.bb b/meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_11.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/pulseaudio/pulseaudio_11.1.bb rename to meta-gnome/recipes-freedesktop/pulseaudio/pulseaudio_11.1.bb diff --git a/meta-citadel/recipes-desktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb b/meta-gnome/recipes-freedesktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb similarity index 100% rename from meta-citadel/recipes-desktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb rename to meta-gnome/recipes-freedesktop/sound-theme-freedesktop/sound-theme-freedesktop_0.8.bb diff --git a/meta-citadel/recipes-desktop/upower/upower_0.99.7.bb b/meta-gnome/recipes-freedesktop/upower/upower_0.99.7.bb similarity index 100% rename from meta-citadel/recipes-desktop/upower/upower_0.99.7.bb rename to meta-gnome/recipes-freedesktop/upower/upower_0.99.7.bb diff --git a/meta-citadel/recipes-desktop/atk/at-spi2-atk_2.26.1.bb b/meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/atk/at-spi2-atk_2.26.1.bb rename to meta-gnome/recipes-gnome/atk/at-spi2-atk_2.26.1.bb diff --git a/meta-citadel/recipes-desktop/atk/at-spi2-core_2.26.2.bb b/meta-gnome/recipes-gnome/atk/at-spi2-core_2.26.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/atk/at-spi2-core_2.26.2.bb rename to meta-gnome/recipes-gnome/atk/at-spi2-core_2.26.2.bb diff --git a/meta-citadel/recipes-desktop/atk/atk_2.26.1.bb b/meta-gnome/recipes-gnome/atk/atk_2.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/atk/atk_2.26.1.bb rename to meta-gnome/recipes-gnome/atk/atk_2.26.1.bb diff --git a/meta-citadel/recipes-desktop/caribou/caribou_0.4.21.bb b/meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb similarity index 100% rename from meta-citadel/recipes-desktop/caribou/caribou_0.4.21.bb rename to meta-gnome/recipes-gnome/caribou/caribou_0.4.21.bb diff --git a/meta-citadel/recipes-desktop/clutter-gtk/clutter-gtk_1.8.4.bb b/meta-gnome/recipes-gnome/clutter-gtk/clutter-gtk_1.8.4.bb similarity index 100% rename from meta-citadel/recipes-desktop/clutter-gtk/clutter-gtk_1.8.4.bb rename to meta-gnome/recipes-gnome/clutter-gtk/clutter-gtk_1.8.4.bb diff --git a/meta-citadel/recipes-desktop/dconf/dconf_0.26.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/dconf/dconf_0.26.1.bb rename to meta-gnome/recipes-gnome/dconf/dconf_0.26.1.bb diff --git a/meta-citadel/recipes-desktop/gdm/files/0001-replace-absolute-path-with-staging-path.patch b/meta-gnome/recipes-gnome/gdm/files/0001-replace-absolute-path-with-staging-path.patch similarity index 100% rename from meta-citadel/recipes-desktop/gdm/files/0001-replace-absolute-path-with-staging-path.patch rename to meta-gnome/recipes-gnome/gdm/files/0001-replace-absolute-path-with-staging-path.patch diff --git a/meta-citadel/recipes-desktop/gdm/files/gdm.conf b/meta-gnome/recipes-gnome/gdm/files/gdm.conf similarity index 100% rename from meta-citadel/recipes-desktop/gdm/files/gdm.conf rename to meta-gnome/recipes-gnome/gdm/files/gdm.conf diff --git a/meta-citadel/recipes-desktop/gdm/gdm.inc b/meta-gnome/recipes-gnome/gdm/gdm.inc similarity index 100% rename from meta-citadel/recipes-desktop/gdm/gdm.inc rename to meta-gnome/recipes-gnome/gdm/gdm.inc diff --git a/meta-citadel/recipes-desktop/gdm/gdm_3.26.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_3.26.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gdm/gdm_3.26.2.bb rename to meta-gnome/recipes-gnome/gdm/gdm_3.26.2.bb diff --git a/meta-citadel/recipes-desktop/gdm/gdm_3.27.3.bb b/meta-gnome/recipes-gnome/gdm/gdm_3.27.3.bb similarity index 100% rename from meta-citadel/recipes-desktop/gdm/gdm_3.27.3.bb rename to meta-gnome/recipes-gnome/gdm/gdm_3.27.3.bb diff --git a/meta-citadel/recipes-desktop/geocode-glib/geocode-glib_3.25.4.1.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.25.4.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/geocode-glib/geocode-glib_3.25.4.1.bb rename to meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.25.4.1.bb diff --git a/meta-citadel/recipes-desktop/gjs/gjs.inc b/meta-gnome/recipes-gnome/gjs/gjs.inc similarity index 100% rename from meta-citadel/recipes-desktop/gjs/gjs.inc rename to meta-gnome/recipes-gnome/gjs/gjs.inc diff --git a/meta-citadel/recipes-desktop/gjs/gjs_1.50.2.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.50.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gjs/gjs_1.50.2.bb rename to meta-gnome/recipes-gnome/gjs/gjs_1.50.2.bb diff --git a/meta-citadel/recipes-desktop/gjs/gjs_1.51.3.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.51.3.bb similarity index 100% rename from meta-citadel/recipes-desktop/gjs/gjs_1.51.3.bb rename to meta-gnome/recipes-gnome/gjs/gjs_1.51.3.bb diff --git a/meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-autoar/gnome-autoar_0.2.2.bb rename to meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.2.2.bb diff --git a/meta-citadel/recipes-desktop/gnome-backgrounds/gnome-backgrounds_3.26.2.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.26.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-backgrounds/gnome-backgrounds_3.26.2.bb rename to meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.26.2.bb diff --git a/meta-citadel/recipes-desktop/gnome-bluetooth/gnome-bluetooth_3.26.1.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-bluetooth/gnome-bluetooth_3.26.1.bb rename to meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_3.26.1.bb diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center.inc b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center.inc similarity index 100% rename from meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center.inc rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center.inc diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.1.bb rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.26.1.bb diff --git a/meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.2.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.26.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-control-center/gnome-control-center_3.26.2.bb rename to meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.26.2.bb diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop.inc b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop.inc similarity index 100% rename from meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop.inc rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop.inc diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/0001-configure.ac-Remove-gnome-common-macro-calls.patch diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop/gnome-desktop-thumbnail-don-t-convert-time_t-to-long.patch diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.26.2.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.26.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.26.2.bb rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.26.2.bb diff --git a/meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.27.2.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.27.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-desktop/gnome-desktop_3.27.2.bb rename to meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_3.27.2.bb diff --git a/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring.inc b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring.inc similarity index 100% rename from meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring.inc rename to meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring.inc diff --git a/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.20.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.20.1.bb rename to meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.20.1.bb diff --git a/meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.27.2.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.27.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-keyring/gnome-keyring_3.27.2.bb rename to meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.27.2.bb diff --git a/meta-citadel/recipes-desktop/gnome-session/gnome-session.inc b/meta-gnome/recipes-gnome/gnome-session/gnome-session.inc similarity index 100% rename from meta-citadel/recipes-desktop/gnome-session/gnome-session.inc rename to meta-gnome/recipes-gnome/gnome-session/gnome-session.inc diff --git a/meta-citadel/recipes-desktop/gnome-session/gnome-session_3.26.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-session/gnome-session_3.26.1.bb rename to meta-gnome/recipes-gnome/gnome-session/gnome-session_3.26.1.bb diff --git a/meta-citadel/recipes-desktop/gnome-session/gnome-session_3.27.3.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.27.3.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-session/gnome-session_3.27.3.bb rename to meta-gnome/recipes-gnome/gnome-session/gnome-session_3.27.3.bb diff --git a/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon.inc b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon.inc similarity index 100% rename from meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon.inc rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon.inc diff --git a/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb diff --git a/meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb rename to meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell.inc b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell.inc similarity index 100% rename from meta-citadel/recipes-desktop/gnome-shell/gnome-shell.inc rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell.inc diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-no-build-calendar-server.patch diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch similarity index 100% rename from meta-citadel/recipes-desktop/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-do-not-use-python-path-from-build-environment.patch diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.26.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.26.1.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.26.1.bb diff --git a/meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.27.1.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.27.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-shell/gnome-shell_3.27.1.bb rename to meta-gnome/recipes-gnome/gnome-shell/gnome-shell_3.27.1.bb diff --git a/meta-citadel/recipes-desktop/gnome-terminal/files/citadel.desktop b/meta-gnome/recipes-gnome/gnome-terminal/files/citadel.desktop similarity index 100% rename from meta-citadel/recipes-desktop/gnome-terminal/files/citadel.desktop rename to meta-gnome/recipes-gnome/gnome-terminal/files/citadel.desktop diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc similarity index 100% rename from meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal.inc rename to meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal.inc diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.26.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.26.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.26.2.bb rename to meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.26.2.bb diff --git a/meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.27.3.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.27.3.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-terminal/gnome-terminal_3.27.3.bb rename to meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.27.3.bb diff --git a/meta-citadel/recipes-desktop/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb b/meta-gnome/recipes-gnome/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb similarity index 100% rename from meta-citadel/recipes-desktop/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb rename to meta-gnome/recipes-gnome/gnome-tweak-tool/gnome-tweak-tool_3.27.3.bb diff --git a/meta-citadel/recipes-desktop/grilo/grilo_0.3.4.bb b/meta-gnome/recipes-gnome/grilo/grilo_0.3.4.bb similarity index 100% rename from meta-citadel/recipes-desktop/grilo/grilo_0.3.4.bb rename to meta-gnome/recipes-gnome/grilo/grilo_0.3.4.bb diff --git a/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas.inc b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas.inc similarity index 100% rename from meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas.inc rename to meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas.inc diff --git a/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.24.1.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.24.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.24.1.bb rename to meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.24.1.bb diff --git a/meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.27.1.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.27.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/gsettings-desktop-schema/gsettings-desktop-schemas_3.27.1.bb rename to meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_3.27.1.bb diff --git a/meta-citadel/recipes-desktop/libgee/libgee_0.20.0.bb b/meta-gnome/recipes-gnome/libgee/libgee_0.20.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/libgee/libgee_0.20.0.bb rename to meta-gnome/recipes-gnome/libgee/libgee_0.20.0.bb diff --git a/meta-citadel/recipes-desktop/libgtop/libgtop_2.38.0.bb b/meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/libgtop/libgtop_2.38.0.bb rename to meta-gnome/recipes-gnome/libgtop/libgtop_2.38.0.bb diff --git a/meta-citadel/recipes-desktop/libgweather/libgweather_3.26.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather_3.26.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/libgweather/libgweather_3.26.0.bb rename to meta-gnome/recipes-gnome/libgweather/libgweather_3.26.0.bb diff --git a/meta-citadel/recipes-desktop/mutter/mutter/0001-remove-check-for-zenity.patch b/meta-gnome/recipes-gnome/mutter/mutter/0001-remove-check-for-zenity.patch similarity index 100% rename from meta-citadel/recipes-desktop/mutter/mutter/0001-remove-check-for-zenity.patch rename to meta-gnome/recipes-gnome/mutter/mutter/0001-remove-check-for-zenity.patch diff --git a/meta-citadel/recipes-desktop/mutter/mutter_3.26.1.bb b/meta-gnome/recipes-gnome/mutter/mutter_3.26.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/mutter/mutter_3.26.1.bb rename to meta-gnome/recipes-gnome/mutter/mutter_3.26.1.bb diff --git a/meta-citadel/recipes-desktop/nautilus/nautilus/0001-meson-find-libm-correctly.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/0001-meson-find-libm-correctly.patch similarity index 100% rename from meta-citadel/recipes-desktop/nautilus/nautilus/0001-meson-find-libm-correctly.patch rename to meta-gnome/recipes-gnome/nautilus/nautilus/0001-meson-find-libm-correctly.patch diff --git a/meta-citadel/recipes-desktop/nautilus/nautilus_3.26.0.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_3.26.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/nautilus/nautilus_3.26.0.bb rename to meta-gnome/recipes-gnome/nautilus/nautilus_3.26.0.bb diff --git a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet.inc similarity index 100% rename from meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet.inc rename to meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet.inc diff --git a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.4.bb b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.4.bb similarity index 100% rename from meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.4.bb rename to meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.4.bb diff --git a/meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.6.bb b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.6.bb similarity index 100% rename from meta-citadel/recipes-desktop/network-manager-applet/network-manager-applet_1.8.6.bb rename to meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.8.6.bb diff --git a/meta-citadel/recipes-desktop/pango/pango.inc b/meta-gnome/recipes-gnome/pango/pango.inc similarity index 100% rename from meta-citadel/recipes-desktop/pango/pango.inc rename to meta-gnome/recipes-gnome/pango/pango.inc diff --git a/meta-citadel/recipes-desktop/pango/pango_1.40.13.bb b/meta-gnome/recipes-gnome/pango/pango_1.40.13.bb similarity index 100% rename from meta-citadel/recipes-desktop/pango/pango_1.40.13.bb rename to meta-gnome/recipes-gnome/pango/pango_1.40.13.bb diff --git a/meta-citadel/recipes-desktop/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch b/meta-gnome/recipes-gnome/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch similarity index 100% rename from meta-citadel/recipes-desktop/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch rename to meta-gnome/recipes-gnome/tracker/tracker/0001-assume-sqlite-built-threadsafe-and-with-fts5.patch diff --git a/meta-citadel/recipes-desktop/tracker/tracker_2.0.2.bb b/meta-gnome/recipes-gnome/tracker/tracker_2.0.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/tracker/tracker_2.0.2.bb rename to meta-gnome/recipes-gnome/tracker/tracker_2.0.2.bb diff --git a/meta-citadel/recipes-desktop/vte/vte.inc b/meta-gnome/recipes-gnome/vte/vte.inc similarity index 100% rename from meta-citadel/recipes-desktop/vte/vte.inc rename to meta-gnome/recipes-gnome/vte/vte.inc diff --git a/meta-citadel/recipes-desktop/vte/vte_0.50.1.bb b/meta-gnome/recipes-gnome/vte/vte_0.50.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/vte/vte_0.50.1.bb rename to meta-gnome/recipes-gnome/vte/vte_0.50.1.bb diff --git a/meta-citadel/recipes-desktop/vte/vte_0.50.2.bb b/meta-gnome/recipes-gnome/vte/vte_0.50.2.bb similarity index 100% rename from meta-citadel/recipes-desktop/vte/vte_0.50.2.bb rename to meta-gnome/recipes-gnome/vte/vte_0.50.2.bb diff --git a/meta-citadel/recipes-desktop/yelp-tools/yelp-tools_3.18.0.bb b/meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.18.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/yelp-tools/yelp-tools_3.18.0.bb rename to meta-gnome/recipes-gnome/yelp-tools/yelp-tools_3.18.0.bb diff --git a/meta-citadel/recipes-desktop/yelp-xsl/yelp-xsl_3.20.1.bb b/meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.20.1.bb similarity index 100% rename from meta-citadel/recipes-desktop/yelp-xsl/yelp-xsl_3.20.1.bb rename to meta-gnome/recipes-gnome/yelp-xsl/yelp-xsl_3.20.1.bb diff --git a/meta-citadel/recipes-desktop/zenity/zenity.inc b/meta-gnome/recipes-gnome/zenity/zenity.inc similarity index 100% rename from meta-citadel/recipes-desktop/zenity/zenity.inc rename to meta-gnome/recipes-gnome/zenity/zenity.inc diff --git a/meta-citadel/recipes-desktop/zenity/zenity/0001-Don-t-build-help.patch b/meta-gnome/recipes-gnome/zenity/zenity/0001-Don-t-build-help.patch similarity index 100% rename from meta-citadel/recipes-desktop/zenity/zenity/0001-Don-t-build-help.patch rename to meta-gnome/recipes-gnome/zenity/zenity/0001-Don-t-build-help.patch diff --git a/meta-citadel/recipes-desktop/zenity/zenity/0002-Don-t-include-gdialog.patch b/meta-gnome/recipes-gnome/zenity/zenity/0002-Don-t-include-gdialog.patch similarity index 100% rename from meta-citadel/recipes-desktop/zenity/zenity/0002-Don-t-include-gdialog.patch rename to meta-gnome/recipes-gnome/zenity/zenity/0002-Don-t-include-gdialog.patch diff --git a/meta-citadel/recipes-desktop/zenity/zenity_3.24.0.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.24.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/zenity/zenity_3.24.0.bb rename to meta-gnome/recipes-gnome/zenity/zenity_3.24.0.bb diff --git a/meta-citadel/recipes-desktop/zenity/zenity_3.26.0.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.26.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/zenity/zenity_3.26.0.bb rename to meta-gnome/recipes-gnome/zenity/zenity_3.26.0.bb diff --git a/meta-citadel/recipes-desktop/ibus/ibus_1.5.17.bb b/meta-gnome/recipes-support/ibus/ibus_1.5.17.bb similarity index 100% rename from meta-citadel/recipes-desktop/ibus/ibus_1.5.17.bb rename to meta-gnome/recipes-support/ibus/ibus_1.5.17.bb diff --git a/meta-citadel/recipes-support/itstool/itstool_2.0.4.bb b/meta-gnome/recipes-support/itstool/itstool_2.0.4.bb similarity index 100% rename from meta-citadel/recipes-support/itstool/itstool_2.0.4.bb rename to meta-gnome/recipes-support/itstool/itstool_2.0.4.bb diff --git a/meta-citadel/recipes-desktop/lcms/lcms_2.9.bb b/meta-gnome/recipes-support/lcms/lcms_2.9.bb similarity index 100% rename from meta-citadel/recipes-desktop/lcms/lcms_2.9.bb rename to meta-gnome/recipes-support/lcms/lcms_2.9.bb diff --git a/meta-citadel/recipes-desktop/libcanberra/libcanberra_0.30.bb b/meta-gnome/recipes-support/libcanberra/libcanberra_0.30.bb similarity index 100% rename from meta-citadel/recipes-desktop/libcanberra/libcanberra_0.30.bb rename to meta-gnome/recipes-support/libcanberra/libcanberra_0.30.bb diff --git a/meta-foreign/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch b/meta-gnome/recipes-support/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch similarity index 100% rename from meta-foreign/recipes-connectivity/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch rename to meta-gnome/recipes-support/libndp/libndp/0001-include-sys-select.h-for-fd_-definitions.patch diff --git a/meta-foreign/recipes-connectivity/libndp/libndp_1.6.bb b/meta-gnome/recipes-support/libndp/libndp_1.6.bb similarity index 100% rename from meta-foreign/recipes-connectivity/libndp/libndp_1.6.bb rename to meta-gnome/recipes-support/libndp/libndp_1.6.bb diff --git a/meta-citadel/recipes-support/libpcre/libpcre2_%.bbappend b/meta-gnome/recipes-support/libpcre/libpcre2_%.bbappend similarity index 100% rename from meta-citadel/recipes-support/libpcre/libpcre2_%.bbappend rename to meta-gnome/recipes-support/libpcre/libpcre2_%.bbappend diff --git a/meta-citadel/recipes-desktop/libpwquality/libpwquality_1.4.0.bb b/meta-gnome/recipes-support/libpwquality/libpwquality_1.4.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/libpwquality/libpwquality_1.4.0.bb rename to meta-gnome/recipes-support/libpwquality/libpwquality_1.4.0.bb diff --git a/meta-citadel/recipes-desktop/libwacom/libwacom_0.26.bb b/meta-gnome/recipes-support/libwacom/libwacom_0.26.bb similarity index 100% rename from meta-citadel/recipes-desktop/libwacom/libwacom_0.26.bb rename to meta-gnome/recipes-support/libwacom/libwacom_0.26.bb diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0001-compare-the-first-character-of-string-to-be-null-or-.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0001-js.pc.in-do-not-include-RequiredDefines.h-for-depend.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0001-mozjs17.0.0-fix-the-compile-bug-of-powerpc.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0001-regenerate-configure.patch b/meta-gnome/recipes-support/mozjs/mozjs/0001-regenerate-configure.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0001-regenerate-configure.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0001-regenerate-configure.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch b/meta-gnome/recipes-support/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0002-Move-JS_BYTES_PER_WORD-out-of-config.h.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0003-Add-AArch64-support.patch b/meta-gnome/recipes-support/mozjs/mozjs/0003-Add-AArch64-support.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0003-Add-AArch64-support.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0003-Add-AArch64-support.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch b/meta-gnome/recipes-support/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0004-mozbug746112-no-decommit-on-large-pages.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0005-aarch64-64k-page.patch b/meta-gnome/recipes-support/mozjs/mozjs/0005-aarch64-64k-page.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0005-aarch64-64k-page.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0005-aarch64-64k-page.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch b/meta-gnome/recipes-support/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch rename to meta-gnome/recipes-support/mozjs/mozjs/0010-fix-cross-compilation-on-i586-targets.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch b/meta-gnome/recipes-support/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch rename to meta-gnome/recipes-support/mozjs/mozjs/Manually_mmap_heap_memory_esr17.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch b/meta-gnome/recipes-support/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch rename to meta-gnome/recipes-support/mozjs/mozjs/fix-the-compile-error-of-powerpc64.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs/fix_milestone_compile_issue.patch b/meta-gnome/recipes-support/mozjs/mozjs/fix_milestone_compile_issue.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs/fix_milestone_compile_issue.patch rename to meta-gnome/recipes-support/mozjs/mozjs/fix_milestone_compile_issue.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs52.bb b/meta-gnome/recipes-support/mozjs/mozjs52.bb similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs52.bb rename to meta-gnome/recipes-support/mozjs/mozjs52.bb diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch b/meta-gnome/recipes-support/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch rename to meta-gnome/recipes-support/mozjs/mozjs52/0001-do-not-include-RequiredDefines.patch diff --git a/meta-citadel/recipes-desktop/mozjs/mozjs_17.0.0.bb b/meta-gnome/recipes-support/mozjs/mozjs_17.0.0.bb similarity index 100% rename from meta-citadel/recipes-desktop/mozjs/mozjs_17.0.0.bb rename to meta-gnome/recipes-support/mozjs/mozjs_17.0.0.bb diff --git a/meta-citadel/recipes-support/sqlite/sqlite3_%.bbappend b/meta-gnome/recipes-support/sqlite/sqlite3_%.bbappend similarity index 100% rename from meta-citadel/recipes-support/sqlite/sqlite3_%.bbappend rename to meta-gnome/recipes-support/sqlite/sqlite3_%.bbappend