From 51f817524b9304f035b54a67341f7a9fd3a268c5 Mon Sep 17 00:00:00 2001 From: Alexandre Bard Date: Thu, 26 Aug 2021 11:23:17 +0200 Subject: [PATCH] Move bbappends into a bbappend subdirectory They are now sorted depending on which layer the origin bb recipe is located. BugzID: 74466 --- .../core/recipes-core}/base-files/base-files_%.bbappend | 0 .../recipes-core}/busybox/busybox/busybox-syslog.service.in | 0 .../core/recipes-core}/busybox/busybox/cryptpw.cfg | 0 .../core/recipes-core}/busybox/busybox/no_rfkill.cfg | 0 .../core/recipes-core}/busybox/busybox_%.bbappend | 0 .../systemd/systemd-conf/am335x-nmhw24/system.conf | 0 .../systemd/systemd-conf/armada-385-nbhw14/system.conf | 0 .../systemd/systemd-conf/armada-385-nbhw17/system.conf | 0 .../systemd/systemd-conf/armada-385-nrhw18/system.conf | 0 .../core/recipes-core}/systemd/systemd-conf_%.bbappend | 0 .../core/recipes-core}/systemd/systemd/journald.conf | 0 .../core/recipes-core}/systemd/systemd_%.bbappend | 0 .../core/recipes-devtools}/python/python3_%.bbappend | 0 .../core/recipes-support}/curl/curl_%.bbappend | 0 .../recipes-support}/chrony/chrony_%.bbappend | 0 .../recipes-support}/chrony/files/chrony.conf | 0 .../recipes-support}/dnsmasq/dnsmasq_%.bbappend | 0 .../recipes-extended}/haveged/haveged_%.bbappend | 0 .../haveged/patches/start-daemon-with-data-arg-16.patch | 0 .../sota/recipes-core}/images/initramfs-ostree-image.bbappend | 0 .../ostree-initrd/files/0001-Remove-log-info-from-init.patch | 0 .../sota/recipes-sota}/ostree-initrd/ostree-initrd.bbappend | 0 .../ostree-kernel-initramfs_%.bbappend | 0 conf/layer.conf | 4 +++- 24 files changed, 3 insertions(+), 1 deletion(-) rename {recipes-core => bbappends/core/recipes-core}/base-files/base-files_%.bbappend (100%) rename {recipes-core => bbappends/core/recipes-core}/busybox/busybox/busybox-syslog.service.in (100%) rename {recipes-core => bbappends/core/recipes-core}/busybox/busybox/cryptpw.cfg (100%) rename {recipes-core => bbappends/core/recipes-core}/busybox/busybox/no_rfkill.cfg (100%) rename {recipes-core => bbappends/core/recipes-core}/busybox/busybox_%.bbappend (100%) rename {recipes-core => bbappends/core/recipes-core}/systemd/systemd-conf/am335x-nmhw24/system.conf (100%) rename {recipes-core => bbappends/core/recipes-core}/systemd/systemd-conf/armada-385-nbhw14/system.conf (100%) rename {recipes-core => bbappends/core/recipes-core}/systemd/systemd-conf/armada-385-nbhw17/system.conf (100%) rename {recipes-core => bbappends/core/recipes-core}/systemd/systemd-conf/armada-385-nrhw18/system.conf (100%) rename {recipes-core => bbappends/core/recipes-core}/systemd/systemd-conf_%.bbappend (100%) rename {recipes-core => bbappends/core/recipes-core}/systemd/systemd/journald.conf (100%) rename {recipes-core => bbappends/core/recipes-core}/systemd/systemd_%.bbappend (100%) rename {recipes-devtools => bbappends/core/recipes-devtools}/python/python3_%.bbappend (100%) rename {recipes-support => bbappends/core/recipes-support}/curl/curl_%.bbappend (100%) rename {recipes-support => bbappends/networking-layer/recipes-support}/chrony/chrony_%.bbappend (100%) rename {recipes-support => bbappends/networking-layer/recipes-support}/chrony/files/chrony.conf (100%) rename {recipes-support => bbappends/networking-layer/recipes-support}/dnsmasq/dnsmasq_%.bbappend (100%) rename {recipes-extended => bbappends/openembedded-layer/recipes-extended}/haveged/haveged_%.bbappend (100%) rename {recipes-extended => bbappends/openembedded-layer/recipes-extended}/haveged/patches/start-daemon-with-data-arg-16.patch (100%) rename {recipes-core => bbappends/sota/recipes-core}/images/initramfs-ostree-image.bbappend (100%) rename {recipes-sota => bbappends/sota/recipes-sota}/ostree-initrd/files/0001-Remove-log-info-from-init.patch (100%) rename {recipes-sota => bbappends/sota/recipes-sota}/ostree-initrd/ostree-initrd.bbappend (100%) rename {recipes-sota => bbappends/sota/recipes-sota}/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend (100%) diff --git a/recipes-core/base-files/base-files_%.bbappend b/bbappends/core/recipes-core/base-files/base-files_%.bbappend similarity index 100% rename from recipes-core/base-files/base-files_%.bbappend rename to bbappends/core/recipes-core/base-files/base-files_%.bbappend diff --git a/recipes-core/busybox/busybox/busybox-syslog.service.in b/bbappends/core/recipes-core/busybox/busybox/busybox-syslog.service.in similarity index 100% rename from recipes-core/busybox/busybox/busybox-syslog.service.in rename to bbappends/core/recipes-core/busybox/busybox/busybox-syslog.service.in diff --git a/recipes-core/busybox/busybox/cryptpw.cfg b/bbappends/core/recipes-core/busybox/busybox/cryptpw.cfg similarity index 100% rename from recipes-core/busybox/busybox/cryptpw.cfg rename to bbappends/core/recipes-core/busybox/busybox/cryptpw.cfg diff --git a/recipes-core/busybox/busybox/no_rfkill.cfg b/bbappends/core/recipes-core/busybox/busybox/no_rfkill.cfg similarity index 100% rename from recipes-core/busybox/busybox/no_rfkill.cfg rename to bbappends/core/recipes-core/busybox/busybox/no_rfkill.cfg diff --git a/recipes-core/busybox/busybox_%.bbappend b/bbappends/core/recipes-core/busybox/busybox_%.bbappend similarity index 100% rename from recipes-core/busybox/busybox_%.bbappend rename to bbappends/core/recipes-core/busybox/busybox_%.bbappend diff --git a/recipes-core/systemd/systemd-conf/am335x-nmhw24/system.conf b/bbappends/core/recipes-core/systemd/systemd-conf/am335x-nmhw24/system.conf similarity index 100% rename from recipes-core/systemd/systemd-conf/am335x-nmhw24/system.conf rename to bbappends/core/recipes-core/systemd/systemd-conf/am335x-nmhw24/system.conf diff --git a/recipes-core/systemd/systemd-conf/armada-385-nbhw14/system.conf b/bbappends/core/recipes-core/systemd/systemd-conf/armada-385-nbhw14/system.conf similarity index 100% rename from recipes-core/systemd/systemd-conf/armada-385-nbhw14/system.conf rename to bbappends/core/recipes-core/systemd/systemd-conf/armada-385-nbhw14/system.conf diff --git a/recipes-core/systemd/systemd-conf/armada-385-nbhw17/system.conf b/bbappends/core/recipes-core/systemd/systemd-conf/armada-385-nbhw17/system.conf similarity index 100% rename from recipes-core/systemd/systemd-conf/armada-385-nbhw17/system.conf rename to bbappends/core/recipes-core/systemd/systemd-conf/armada-385-nbhw17/system.conf diff --git a/recipes-core/systemd/systemd-conf/armada-385-nrhw18/system.conf b/bbappends/core/recipes-core/systemd/systemd-conf/armada-385-nrhw18/system.conf similarity index 100% rename from recipes-core/systemd/systemd-conf/armada-385-nrhw18/system.conf rename to bbappends/core/recipes-core/systemd/systemd-conf/armada-385-nrhw18/system.conf diff --git a/recipes-core/systemd/systemd-conf_%.bbappend b/bbappends/core/recipes-core/systemd/systemd-conf_%.bbappend similarity index 100% rename from recipes-core/systemd/systemd-conf_%.bbappend rename to bbappends/core/recipes-core/systemd/systemd-conf_%.bbappend diff --git a/recipes-core/systemd/systemd/journald.conf b/bbappends/core/recipes-core/systemd/systemd/journald.conf similarity index 100% rename from recipes-core/systemd/systemd/journald.conf rename to bbappends/core/recipes-core/systemd/systemd/journald.conf diff --git a/recipes-core/systemd/systemd_%.bbappend b/bbappends/core/recipes-core/systemd/systemd_%.bbappend similarity index 100% rename from recipes-core/systemd/systemd_%.bbappend rename to bbappends/core/recipes-core/systemd/systemd_%.bbappend diff --git a/recipes-devtools/python/python3_%.bbappend b/bbappends/core/recipes-devtools/python/python3_%.bbappend similarity index 100% rename from recipes-devtools/python/python3_%.bbappend rename to bbappends/core/recipes-devtools/python/python3_%.bbappend diff --git a/recipes-support/curl/curl_%.bbappend b/bbappends/core/recipes-support/curl/curl_%.bbappend similarity index 100% rename from recipes-support/curl/curl_%.bbappend rename to bbappends/core/recipes-support/curl/curl_%.bbappend diff --git a/recipes-support/chrony/chrony_%.bbappend b/bbappends/networking-layer/recipes-support/chrony/chrony_%.bbappend similarity index 100% rename from recipes-support/chrony/chrony_%.bbappend rename to bbappends/networking-layer/recipes-support/chrony/chrony_%.bbappend diff --git a/recipes-support/chrony/files/chrony.conf b/bbappends/networking-layer/recipes-support/chrony/files/chrony.conf similarity index 100% rename from recipes-support/chrony/files/chrony.conf rename to bbappends/networking-layer/recipes-support/chrony/files/chrony.conf diff --git a/recipes-support/dnsmasq/dnsmasq_%.bbappend b/bbappends/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend similarity index 100% rename from recipes-support/dnsmasq/dnsmasq_%.bbappend rename to bbappends/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend diff --git a/recipes-extended/haveged/haveged_%.bbappend b/bbappends/openembedded-layer/recipes-extended/haveged/haveged_%.bbappend similarity index 100% rename from recipes-extended/haveged/haveged_%.bbappend rename to bbappends/openembedded-layer/recipes-extended/haveged/haveged_%.bbappend diff --git a/recipes-extended/haveged/patches/start-daemon-with-data-arg-16.patch b/bbappends/openembedded-layer/recipes-extended/haveged/patches/start-daemon-with-data-arg-16.patch similarity index 100% rename from recipes-extended/haveged/patches/start-daemon-with-data-arg-16.patch rename to bbappends/openembedded-layer/recipes-extended/haveged/patches/start-daemon-with-data-arg-16.patch diff --git a/recipes-core/images/initramfs-ostree-image.bbappend b/bbappends/sota/recipes-core/images/initramfs-ostree-image.bbappend similarity index 100% rename from recipes-core/images/initramfs-ostree-image.bbappend rename to bbappends/sota/recipes-core/images/initramfs-ostree-image.bbappend diff --git a/recipes-sota/ostree-initrd/files/0001-Remove-log-info-from-init.patch b/bbappends/sota/recipes-sota/ostree-initrd/files/0001-Remove-log-info-from-init.patch similarity index 100% rename from recipes-sota/ostree-initrd/files/0001-Remove-log-info-from-init.patch rename to bbappends/sota/recipes-sota/ostree-initrd/files/0001-Remove-log-info-from-init.patch diff --git a/recipes-sota/ostree-initrd/ostree-initrd.bbappend b/bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend similarity index 100% rename from recipes-sota/ostree-initrd/ostree-initrd.bbappend rename to bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend diff --git a/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend b/bbappends/sota/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend similarity index 100% rename from recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend rename to bbappends/sota/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_%.bbappend diff --git a/conf/layer.conf b/conf/layer.conf index d9bc0c0..a037e5c 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -3,7 +3,9 @@ BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" + ${LAYERDIR}/recipes-*/*/*.bbappend \ + ${LAYERDIR}/bbappends/*/recipes-*/*/*.bbappend \ + " BBFILE_COLLECTIONS += "netmodule-distro" BBFILE_PATTERN_netmodule-distro = "^${LAYERDIR}/"