From 0eb95212a7e6b6bdc1243094072dea432cb48f0f Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 11 Mar 2021 00:46:22 -0800 Subject: image.bbclass: deltask do_packagedata This can fix a do_package error when compile with meta-secure-core layer: http://layers.openembedded.org/layerindex/branch/master/layer/meta-secure-core/ $ bitbake kernel-initramfs [snip] WARNING:kernel-initramfs-1.0-r0 do_package: Manifest build/tmp-glibc/sstate-control/manifest-x86_64_x86_64-nativesdk-secure-core-image-initramfs.packagedata not found in intel_x86_64 corei7-64 core2-64 x86_64 allarch x86_64_x86_64-nativesdk (variant '')? [snip] This is because kernel-initramfs wants to pack an initramfs image into kernel-initramfs.rpm which adds a dependency in kernel-initramfs.bb to do this: d.appendVarFlag('do_install', 'depends', ' ${INITRAMFS_IMAGE}:do_image_complete') This causes kernel-initramfs' do_package depends on ${INITRAMFS_IMAGE}:do_image_complete's do_packagedata, then we will get the error. Delete do_packagedata as other do_package relelated tasks for the image recipe will fix the error. RP: There is a side effect from this change which means that image tasks will no longer run their fetch/unpack/configure/compile/install tasks as these become detached from the dependency chain. The standard tasks are noexec or deleted anyway already so this shouldn't be a significant change. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/image.bbclass') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 41fc329178..b558653635 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -612,7 +612,7 @@ deltask do_populate_lic deltask do_populate_sysroot do_package[noexec] = "1" deltask do_package_qa -do_packagedata[noexec] = "1" +deltask do_packagedata deltask do_package_write_ipk deltask do_package_write_deb deltask do_package_write_rpm -- cgit 1.2.3-korg