From 5d676a7efd2f7bfc72ff5da2176609f2b0ee5ce4 Mon Sep 17 00:00:00 2001 From: Drew Moseley Date: Fri, 16 Aug 2019 15:42:09 +0000 Subject: [PATCH] mender: Use += rather than _append for IMAGE_FSTYPES. Using _append breaks initramfs builds and attempts to build Mender style images for them. Basically, the initramfs image files set a new value of IMAGE_FSTYPES but when we use _append we are applied _after_ that; using += makes sure that the override done in the image recipe takes place. More details can be seen in this discussion: https://github.com/ndechesne/meta-qcom/issues/61 Changelog: Title Signed-off-by: Drew Moseley --- meta-mender-core/classes/mender-part-images.bbclass | 2 +- meta-mender-core/classes/mender-setup-image.inc | 12 ++++++------ tests/acceptance/test_build.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta-mender-core/classes/mender-part-images.bbclass b/meta-mender-core/classes/mender-part-images.bbclass index d4b1ff114..1b5dba1be 100644 --- a/meta-mender-core/classes/mender-part-images.bbclass +++ b/meta-mender-core/classes/mender-part-images.bbclass @@ -282,7 +282,7 @@ python() { d.setVar('LIVE_ROOTFS_TYPE', type) d.setVar('ROOTFS', "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.%s.bz2" % type) - d.setVar('IMAGE_FSTYPES_append', ' %s.bz2 ' % type) + d.appendVar('IMAGE_FSTYPES', ' %s.bz2 ' % type) # Remove the boot option on the Live installer; it won't work since Mender hard codes # the device nodes diff --git a/meta-mender-core/classes/mender-setup-image.inc b/meta-mender-core/classes/mender-setup-image.inc index 5a60aed71..5c57b3f77 100644 --- a/meta-mender-core/classes/mender-setup-image.inc +++ b/meta-mender-core/classes/mender-setup-image.inc @@ -1,9 +1,9 @@ -IMAGE_FSTYPES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image', ' mender mender.bmap', '', d)}" -IMAGE_FSTYPES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-sd', ' sdimg sdimg.bmap', '', d)}" -IMAGE_FSTYPES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-ubi', ' ubimg mtdimg ubimg.bmap', '', d)}" -IMAGE_FSTYPES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-uefi', ' uefiimg uefiimg.bmap', '', d)}" -IMAGE_FSTYPES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-bios', ' biosimg biosimg.bmap', '', d)}" -IMAGE_FSTYPES_append = "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-gpt', ' gptimg gptimg.bmap', '', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image', ' mender mender.bmap', '', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-sd', ' sdimg sdimg.bmap', '', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-ubi', ' ubimg mtdimg ubimg.bmap', '', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-uefi', ' uefiimg uefiimg.bmap', '', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-bios', ' biosimg biosimg.bmap', '', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'mender-image-gpt', ' gptimg gptimg.bmap', '', d)}" MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_mender-image_x86 = " kernel-image" MACHINE_ESSENTIAL_EXTRA_RDEPENDS_append_mender-image_x86-64 = " kernel-image" diff --git a/tests/acceptance/test_build.py b/tests/acceptance/test_build.py index d2b1925b9..7e54c2e9e 100644 --- a/tests/acceptance/test_build.py +++ b/tests/acceptance/test_build.py @@ -132,7 +132,7 @@ def test_tenant_token(self, prepared_test_build): add_to_local_conf(prepared_test_build, 'MENDER_TENANT_TOKEN = "%s"' % "authtentoken") - add_to_local_conf(prepared_test_build, 'IMAGE_FSTYPES_append = " dataimg"') + add_to_local_conf(prepared_test_build, 'IMAGE_FSTYPES += "dataimg"') run_bitbake(prepared_test_build)