summaryrefslogtreecommitdiffstats
path: root/meta-phosphor/conf
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2016-02-29 10:21:51 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2016-02-29 10:35:00 -0500
commit327bfd6b829fbac6ff9a050745f4e10b48c79ac5 (patch)
tree75d448276e5522ba2b3618b0c4e85da64ad73496 /meta-phosphor/conf
parentbd0821703109a0eea6a06ed846735c4039921b85 (diff)
downloadtalos-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/conf')
-rw-r--r--meta-phosphor/conf/machine/include/obmc-bsp-common.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index fb6cc8ce7..60ed0888a 100644
--- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -17,7 +17,6 @@ IMAGE_FSTYPES += "overlay"
IMAGE_INSTALL += "u-boot-fw-utils"
IMAGE_CLASSES += "obmc-phosphor-image_types_uboot"
-IMAGE_CLASSES += "image-overlay"
INITRAMFS_CTYPE ?= "lzma"
INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}"
OpenPOWER on IntegriCloud