From 39ce1d56594ce6757e60d36a7878da17f2b36b5f Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 25 Jan 2017 14:25:02 +0000 Subject: image/packagegroup/populate_sdk: Drop do_populate_sysroot task properly Setting do_populate_sysroot as noexec means the code keeps thinking it can find a manifest file for it. It also complicates sstate installtion since the code would believe there is an sstate object there it should look for. Instead, delete the task. This causes sdk failures as the dependencies are wrong so fix those as well. (From OE-Core rev: bd7d0314038a4c1a8e8c9ebdb7194f8e17db3fef) (From OE-Core rev: 249feee857735171fc0c289fe18351203d013130) Signed-off-by: Richard Purdie [Fixup for getVar True bit] Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- meta/classes/image.bbclass | 2 +- meta/classes/packagegroup.bbclass | 2 +- meta/classes/populate_sdk_base.bbclass | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 92b09ab1e2..02ff37f2f4 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -606,7 +606,7 @@ do_patch[noexec] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" -do_populate_sysroot[noexec] = "1" +deltask do_populate_sysroot do_package[noexec] = "1" do_package_qa[noexec] = "1" do_packagedata[noexec] = "1" diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass index 3928c8a4ac..15969af593 100644 --- a/meta/classes/packagegroup.bbclass +++ b/meta/classes/packagegroup.bbclass @@ -46,7 +46,7 @@ do_patch[noexec] = "1" do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" -do_populate_sysroot[noexec] = "1" +deltask do_populate_sysroot python () { initman = d.getVar("VIRTUAL-RUNTIME_init_manager", True) diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 1f47a7cc80..e841fbe500 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -274,6 +274,6 @@ do_populate_sdk[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-reloca do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}" do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" -do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}" +do_populate_sdk[rdepends] = "${@' '.join([x + ':do_package_write_${IMAGE_PKGTYPE} ' + x + ':do_packagedata' for x in d.getVar('SDK_RDEPENDS', True).split()])}" do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb" addtask populate_sdk -- cgit v1.2.3-54-g00ecf