diff options
Diffstat (limited to 'meta-phosphor')
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image.bbclass | 11 | ||||
| -rw-r--r-- | meta-phosphor/conf/machine/include/obmc-bsp-common.inc | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass index d3960c737..2d97cdef6 100644 --- a/meta-phosphor/classes/obmc-phosphor-image.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass @@ -48,9 +48,10 @@ CORE_IMAGE_EXTRA_INSTALL_append = " bash \ OBMC_IMAGE_EXTRA_INSTALL ?= "" -def build_overlay(d): - if bb.utils.contains("IMAGE_FSTYPES", "overlay", "overlay", "0", d) != "0": - return "image-overlay" - return "" +def image_overlay_enabled(d, ifEnabledStr): + if d.getVar('OBMC_PHOSPHOR_IMAGE_OVERLAY', True) != "1": + return "" + return ifEnabledStr -inherit ${@build_overlay(d)} +IMAGE_FSTYPES += "${@image_overlay_enabled(d, "overlay")}" +inherit ${@image_overlay_enabled(d, "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 8d1fd7ef5..2b6a1632b 100644 --- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc +++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc @@ -13,7 +13,7 @@ UBOOT_SUFFIX ?= "bin" MACHINEOVERRIDES =. "openbmc:" -IMAGE_FSTYPES += "overlay" +OBMC_PHOSPHOR_IMAGE_OVERLAY= "1" IMAGE_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot" OBMC_IMAGE_EXTRA_INSTALL_append = " u-boot-fw-utils" |
