| commit | b5c22690c606423fcf2a79cfd691f174f49b08ee | [log] [tgz] |
|---|---|---|
| author | Andrew Geissler <geissonator@yahoo.com> | Fri Jun 30 15:46:00 2023 -0500 |
| committer | Andrew Geissler <geissonator@yahoo.com> | Tue Jul 18 14:28:06 2023 +0000 |
| tree | 42a8ad6c0f3909dbd2857405eba97727da9f6685 | |
| parent | d8edd104e2ed89b51a5adebab05724960bd9dd55 [diff] |
meta-ibm: only use openpower bbappend when including layer There is a desire to add non-openpower systems to the meta-ibm layer. To do that, need to ensure the bbappend files that are appending to openpower recipes are only included if the machine being built includes the meta-openpower layer. Tested: - Confirmed a system not including meta-openpower builds ok with this - Confirmed p10bmc still uses the bbappend files Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I32a08e9f20a20152d51c77cdfca6bbc15b5e93d4
diff --git a/meta-ibm/conf/layer.conf b/meta-ibm/conf/layer.conf index 763f4f5..d8478bb 100644 --- a/meta-ibm/conf/layer.conf +++ b/meta-ibm/conf/layer.conf
@@ -8,3 +8,9 @@ BBFILE_COLLECTIONS += "ibm-layer" BBFILE_PATTERN_ibm-layer := "^${LAYERDIR}/" LAYERSERIES_COMPAT_ibm-layer = "langdale mickledore" + +# Only bring in meta-openpower bbappend files if meta-openpower is +# included in the layer +BBFILES_DYNAMIC += "\ + openpower-layer:${LAYERDIR}/dynamic-layers/meta-openpower/recipes-*/*/*.bbappend \ +"
diff --git a/meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_%.bbappend similarity index 100% rename from meta-ibm/recipes-phosphor/debug/openpower-debug-collector_%.bbappend rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/debug/openpower-debug-collector_%.bbappend
diff --git a/meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/flash/openpower-software-manager_%.bbappend similarity index 100% rename from meta-ibm/recipes-phosphor/flash/openpower-software-manager_%.bbappend rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/flash/openpower-software-manager_%.bbappend
diff --git a/meta-ibm/recipes-phosphor/host/op-proc-control_git.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/op-proc-control_git.bbappend similarity index 100% rename from meta-ibm/recipes-phosphor/host/op-proc-control_git.bbappend rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/op-proc-control_git.bbappend
diff --git a/meta-ibm/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/p9-host-start.bbappend similarity index 100% rename from meta-ibm/recipes-phosphor/host/p9-host-start.bbappend rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/host/p9-host-start.bbappend
diff --git a/meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend similarity index 100% rename from meta-ibm/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
diff --git a/meta-ibm/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend similarity index 100% rename from meta-ibm/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/packagegroups/packagegroup-op-apps.bbappend
diff --git a/meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend b/meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend similarity index 100% rename from meta-ibm/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend rename to meta-ibm/dynamic-layers/meta-openpower/recipes-phosphor/vpd/openpower-fru-vpd_%.bbappend