From 5a1526e33f3a5ebd2bc33e1da352d8a519d31fb5 Mon Sep 17 00:00:00 2001 From: Jose Quaresma Date: Fri, 4 Nov 2022 16:56:29 +0000 Subject: [PATCH] base: initramfs-ostree-lmp-image: use a python anonimus to check IMAGE_FSTYPES Signed-off-by: Jose Quaresma --- .../recipes-core/images/initramfs-ostree-lmp-image.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta-lmp-base/recipes-core/images/initramfs-ostree-lmp-image.bb b/meta-lmp-base/recipes-core/images/initramfs-ostree-lmp-image.bb index 5d46c067d1..b08fe3b375 100644 --- a/meta-lmp-base/recipes-core/images/initramfs-ostree-lmp-image.bb +++ b/meta-lmp-base/recipes-core/images/initramfs-ostree-lmp-image.bb @@ -27,9 +27,7 @@ IMAGE_LINGUAS = "" LICENSE = "MIT" -IMAGE_FSTYPES = "cpio.gz" -IMAGE_FSTYPES:remove = "wic wic.gz wic.bmap wic.nopt ext4 ext4.gz" -IMAGE_CLASSES:remove = "image_repo_manifest" +IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}" # avoid circular dependencies EXTRA_IMAGEDEPENDS = "" @@ -47,3 +45,10 @@ BAD_RECOMMENDATIONS += "busybox-syslog" SSTATE_SKIP_CREATION:task-image-qa = "0" SSTATE_SKIP_CREATION:task-image-complete = "0" + +python () { + initramfs_fstypes = d.getVar('INITRAMFS_FSTYPES') + image_fstypes = d.getVar('IMAGE_FSTYPES') + if image_fstypes != initramfs_fstypes: + bb.fatal('IMAGE_FSTYPES="%s" is not equal to INITRAMFS_FSTYPES="%s"' % (image_fstypes, initramfs_fstypes)) +}