diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/packagegroup.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 2 |
3 files changed, 3 insertions, 7 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" diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass index a60a52b6d4..ad6c8b0e35 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") diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 5ad08c68e3..2246eb3f1f 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -273,6 +273,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').split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" -do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS').split()])}" +do_populate_sdk[rdepends] = "${@' '.join([x + ':do_package_write_${IMAGE_PKGTYPE} ' + x + ':do_packagedata' for x in d.getVar('SDK_RDEPENDS').split()])}" do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb" addtask populate_sdk |