From d58f23c78a2501d4b6ed36a74c23de28595d4f78 Mon Sep 17 00:00:00 2001 From: Patrick Williams Date: Tue, 28 Dec 2021 21:36:33 -0600 Subject: 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 Change-Id: I166342c1744d1cd0237f8c75d90d87153fb19b35 --- .../recipes-phosphor/images/obmc-phosphor-image.bbappend | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'meta-facebook/recipes-phosphor/images/obmc-phosphor-image.bbappend') 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. -- cgit v1.2.3