diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-14 15:24:22 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-14 16:29:05 -0400 |
| commit | adb60e8a6bcfb4f651d9fa88ef776ae109acabd8 (patch) | |
| tree | 340bdfe00c5f5db090ca61fd66638fe8b955d6a7 | |
| parent | 9f1d336d6708a63c7c59f8938bc0d4f365d4671a (diff) | |
| download | talos-openbmc-adb60e8a6bcfb4f651d9fa88ef776ae109acabd8.tar.gz talos-openbmc-adb60e8a6bcfb4f651d9fa88ef776ae109acabd8.zip | |
Add OBMC_IMAGE_EXTRA_INSTALL variable
Prior to this patch packagegroup-core-boot was not being pulled in.
core-boot is what brings in the init_manager (systemd) but
somehow systemd was added as a dependency by OE for the skeleton package
so the missing core-boot packagegroup went unnoticed.
core-boot was not being pulled in because of an assignment to
IMAGE_INSTALL in the global configuration. Yocto core provides a
mechanism to do the same thing safely - CORE_IMAGE_EXTRA_INSTALL;
use this and also adopt a similar approach for adding extra packages
to image recipes using obmc-phosphor-image.
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend index 7b8aa6f87..cf4f29da0 100644 --- a/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-openbmc-machines/meta-openpower/common/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,3 +1 @@ -IMAGE_INSTALL += " \ - inventory-upload \ -" +OBMC_IMAGE_EXTRA_INSTALL_append = " inventory-upload" diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index ce54777bc..c715dedbf 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -36,15 +36,17 @@ IMAGE_FEATURES += " \ ssh-server-dropbear \ " -IMAGE_INSTALL += " \ - bash \ +CORE_IMAGE_EXTRA_INSTALL_append = " bash \ packagegroup-obmc-phosphor-apps-extras \ i2c-tools \ screen \ inarp \ obmc-console \ + ${OBMC_IMAGE_EXTRA_INSTALL} \ " +OBMC_IMAGE_EXTRA_INSTALL ?= "" + def build_overlay(d): if bb.utils.contains("IMAGE_FSTYPES", "overlay", "overlay", "0", d) != "0": return "image-overlay" diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc index 260cc90a3..8d1fd7ef5 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -15,7 +15,7 @@ MACHINEOVERRIDES =. "openbmc:" IMAGE_FSTYPES += "overlay" IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot" -IMAGE_INSTALL += "u-boot-fw-utils" +OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils" IMAGE_CLASSES += "obmc-phosphor-image_types_uboot" |
