diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-25 14:25:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-26 10:41:09 +0000 |
| commit | bd7d0314038a4c1a8e8c9ebdb7194f8e17db3fef (patch) | |
| tree | 3da21882eed04aa0c9e9c7eb3d2938a192fa1c44 /meta/classes/image.bbclass | |
| parent | 5599cb72d17bce2ba6e2be16ef64d9a388bcfb25 (diff) | |
| download | openembedded-core-contrib-bd7d0314038a4c1a8e8c9ebdb7194f8e17db3fef.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index fb0cce35c5..76146c92cd 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -96,10 +96,6 @@ LDCONFIGDEPEND_libc-musl = "" # don't want this dependency, which is causing dependency loop KERNELDEPMODDEPEND ?= "virtual/kernel:do_packagedata" -# POPULATESYSROOTDEPS fails to expand correctly with multilibs since overrides aren't set for image.bbclass -# we don't need these depends so just clear them -do_populate_sysroot[depends] = "" - do_rootfs[depends] += " \ makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \ virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \ @@ -625,7 +621,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" |