From 327bfd6b829fbac6ff9a050745f4e10b48c79ac5 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 29 Feb 2016 10:21:51 -0500 Subject: 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. --- meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-phosphor/conf/machine') 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}" -- cgit v1.2.1