summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-25 14:25:02 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:13:48 (GMT)
commit39ce1d56594ce6757e60d36a7878da17f2b36b5f (patch)
tree78addc3cd0c1e1a38a64f70629b40a638c2f1fca
parent825e432a0c8c341abb945b703644f69fbcc93d3f (diff)
downloadpoky-39ce1d56594ce6757e60d36a7878da17f2b36b5f.tar.gz
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 <richard.purdie@linuxfoundation.org> [Fixup for getVar True bit] Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/packagegroup.bbclass2
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 92b09ab..02ff37f 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -606,7 +606,7 @@ do_patch[noexec] = "1"
606do_configure[noexec] = "1" 606do_configure[noexec] = "1"
607do_compile[noexec] = "1" 607do_compile[noexec] = "1"
608do_install[noexec] = "1" 608do_install[noexec] = "1"
609do_populate_sysroot[noexec] = "1" 609deltask do_populate_sysroot
610do_package[noexec] = "1" 610do_package[noexec] = "1"
611do_package_qa[noexec] = "1" 611do_package_qa[noexec] = "1"
612do_packagedata[noexec] = "1" 612do_packagedata[noexec] = "1"
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 3928c8a..15969af 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -46,7 +46,7 @@ do_patch[noexec] = "1"
46do_configure[noexec] = "1" 46do_configure[noexec] = "1"
47do_compile[noexec] = "1" 47do_compile[noexec] = "1"
48do_install[noexec] = "1" 48do_install[noexec] = "1"
49do_populate_sysroot[noexec] = "1" 49deltask do_populate_sysroot
50 50
51python () { 51python () {
52 initman = d.getVar("VIRTUAL-RUNTIME_init_manager", True) 52 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 1f47a7c..e841fbe 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
274 274
275do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}" 275do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
276do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" 276do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}"
277do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}" 277do_populate_sdk[rdepends] = "${@' '.join([x + ':do_package_write_${IMAGE_PKGTYPE} ' + x + ':do_packagedata' for x in d.getVar('SDK_RDEPENDS', True).split()])}"
278do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb" 278do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb"
279addtask populate_sdk 279addtask populate_sdk