diff options
author | P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> | 2022-03-30 23:46:16 +0300 |
---|---|---|
committer | P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> | 2022-03-30 23:46:16 +0300 |
commit | 2af35ee50ce9918ee3626c59f2cff62cd3ab9568 (patch) | |
tree | bcc218f953c63222bff793a788b7922b9e39fb88 /meta-facebook/recipes-phosphor/images | |
parent | 7cf0c1cd0ce835d1833509b7b911e8a97380278b (diff) | |
parent | 9248c75b142fa11243c20f4d200a04e4f6395b51 (diff) | |
download | openbmc-2af35ee50ce9918ee3626c59f2cff62cd3ab9568.tar.xz |
Merge tag '1-0.91' of github.com:intel-innersource/firmware.bmc.openbmc.yocto.openbmc into update
Diffstat (limited to 'meta-facebook/recipes-phosphor/images')
-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 |
2 files changed, 13 insertions, 8 deletions
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 5755aa58b..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', 'tpm2-tools', '', 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. |