summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2021-03-11 00:46:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-15 14:49:09 +0000
commitb608cf6120235754582edd3e73e34a9af0959b79 (patch)
treedeab60115cb664e396bb4c055d52d431eb2c05bf
parente9aac299c74128569e933b66147b5ec6fd29030f (diff)
downloadpoky-b608cf6120235754582edd3e73e34a9af0959b79.tar.gz
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. (From OE-Core rev: 0eb95212a7e6b6bdc1243094072dea432cb48f0f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
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
612deltask do_populate_sysroot 612deltask do_populate_sysroot
613do_package[noexec] = "1" 613do_package[noexec] = "1"
614deltask do_package_qa 614deltask do_package_qa
615do_packagedata[noexec] = "1" 615deltask do_packagedata
616deltask do_package_write_ipk 616deltask do_package_write_ipk
617deltask do_package_write_deb 617deltask do_package_write_deb
618deltask do_package_write_rpm 618deltask do_package_write_rpm