diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2021-12-29 06:36:33 +0300 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2021-12-29 06:39:15 +0300 |
| commit | d58f23c78a2501d4b6ed36a74c23de28595d4f78 (patch) | |
| tree | bc2ef224a256a48fd32bd9e4166e57016adb978b | |
| parent | 16657ece7be5e9e59c295b396440db4447e8b48d (diff) | |
| download | openbmc-d58f23c78a2501d4b6ed36a74c23de28595d4f78.tar.xz | |
meta-facebook: add fb-phosphor-image.inc
Builds done using facebook/openbmc do not use the 'obmc-phosphor-image'
image name, but instead use 'MACHINE-image'. This means that bbappend
files have no effect and we need a different method to get consistent
sets of include files. Introduce 'fb-phosphor-image.inc' and
'fb-MACHINE-phosphor-image.inc' as the replacements for the
obmc-phosphor-image.bbappend.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I166342c1744d1cd0237f8c75d90d87153fb19b35
| -rw-r--r-- | meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc (renamed from meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend) | 2 | ||||
| -rw-r--r-- | meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc | 9 | ||||
| -rw-r--r-- | meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend | 12 |
3 files changed, 14 insertions, 9 deletions
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc index a13903c39..8fa7252e7 100644 --- a/meta-facebook/meta-bletchley/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-facebook/meta-bletchley/recipes-phosphor/images/fb-bletchley-phosphor-image.inc @@ -1,4 +1,4 @@ OBMC_IMAGE_EXTRA_INSTALL:append = " \ phosphor-nvme \ plat-svc \ -" + " diff --git a/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc new file mode 100644 index 000000000..fbc80809c --- /dev/null +++ b/meta-facebook/recipes-phosphor/images/fb-phosphor-image.inc @@ -0,0 +1,9 @@ +IMAGE_FEATURES:remove:fb-nohost = "obmc-console" + +OBMC_IMAGE_EXTRA_INSTALL:append = "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \ + bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d), \ + '', d)} \ + " + +include recipes-phosphor/images/fb-${MACHINE}-phosphor-image.inc diff --git a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend index ba9cc1fe8..23979e66d 100644 --- a/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,9 +1,5 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +require recipes-phosphor/images/fb-phosphor-image.inc -IMAGE_FEATURES:remove:fb-nohost = "obmc-console" - -OBMC_IMAGE_EXTRA_INSTALL:append = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'tpm', \ - bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d), \ - '', d)} \ - " +# Please do not add any content directly to this file. Instead add it to +# the corresponding .inc file. Otherwise, builds from facebook/openbmc will +# not be able to pick up your content. |