diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-14 22:24:22 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-06-14 23:29:05 +0300 |
commit | adb60e8a6bcfb4f651d9fa88ef776ae109acabd8 (patch) | |
tree | 340bdfe00c5f5db090ca61fd66638fe8b955d6a7 /meta-phosphor/classes/obmc-phosphor-image.bbclass | |
parent | 9f1d336d6708a63c7c59f8938bc0d4f365d4671a (diff) | |
download | openbmc-adb60e8a6bcfb4f651d9fa88ef776ae109acabd8.tar.xz |
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>
Diffstat (limited to 'meta-phosphor/classes/obmc-phosphor-image.bbclass')
-rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index ce54777bc9..c715dedbff 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" |