diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-02-29 10:21:51 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-02-29 10:35:00 -0500 |
commit | 327bfd6b829fbac6ff9a050745f4e10b48c79ac5 (patch) | |
tree | 75d448276e5522ba2b3618b0c4e85da64ad73496 /meta-phosphor/classes/obmc-phosphor-image.bbclass | |
parent | bd0821703109a0eea6a06ed846735c4039921b85 (diff) | |
download | talos-openbmc-327bfd6b829fbac6ff9a050745f4e10b48c79ac5.tar.gz talos-openbmc-327bfd6b829fbac6ff9a050745f4e10b48c79ac5.zip |
Don't inherit image-overlay by default
This attempts to address a race condition in the build where
we attempt to build a complete flash image before all the sub-images
are available (specifically the initramfs image).
Any classes in IMAGE_CLASSES are inherited by all image recipes, including
the initramfs image. OE-Core's live/hddimg recipes address this
by pulling in the class configuration in recipe scope, rather than
global scope. Copy that behavior here.
Diffstat (limited to 'meta-phosphor/classes/obmc-phosphor-image.bbclass')
-rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index 811bbd3da..0d4a0d06d 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -42,3 +42,10 @@ IMAGE_INSTALL += " \ i2c-tools \ screen \ " + +def build_overlay(d): + if bb.utils.contains("IMAGE_FSTYPES", "overlay", "overlay", "0", d) != "0": + return "image-overlay" + return "" + +inherit ${@build_overlay(d)} |