[oe-commits] [openembedded-core] 33/38: image/packagegroup/populate_sdk: Drop do_populate_sysroot task properly

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch morty
in repository openembedded-core.

commit 249feee857735171fc0c289fe18351203d013130
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Jan 25 14:25:02 2017 +0000

    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)
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    [Fixup for getVar True bit]
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 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 92b09ab..02ff37f 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 3928c8a..15969af 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 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
 
 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.