summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass6
-rw-r--r--meta/classes/packagegroup.bbclass2
-rw-r--r--meta/classes/populate_sdk_base.bbclass2
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 = ""
96# don't want this dependency, which is causing dependency loop 96# don't want this dependency, which is causing dependency loop
97KERNELDEPMODDEPEND ?= "virtual/kernel:do_packagedata" 97KERNELDEPMODDEPEND ?= "virtual/kernel:do_packagedata"
98 98
99# POPULATESYSROOTDEPS fails to expand correctly with multilibs since overrides aren't set for image.bbclass
100# we don't need these depends so just clear them
101do_populate_sysroot[depends] = ""
102
103do_rootfs[depends] += " \ 99do_rootfs[depends] += " \
104 makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \ 100 makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \
105 virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \ 101 virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \
@@ -625,7 +621,7 @@ do_patch[noexec] = "1"
625do_configure[noexec] = "1" 621do_configure[noexec] = "1"
626do_compile[noexec] = "1" 622do_compile[noexec] = "1"
627do_install[noexec] = "1" 623do_install[noexec] = "1"
628do_populate_sysroot[noexec] = "1" 624deltask do_populate_sysroot
629do_package[noexec] = "1" 625do_package[noexec] = "1"
630do_package_qa[noexec] = "1" 626do_package_qa[noexec] = "1"
631do_packagedata[noexec] = "1" 627do_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"
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") 52 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
273 273
274do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}" 274do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}"
275do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS').split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" 275do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS').split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}"
276do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS').split()])}" 276do_populate_sdk[rdepends] = "${@' '.join([x + ':do_package_write_${IMAGE_PKGTYPE} ' + x + ':do_packagedata' for x in d.getVar('SDK_RDEPENDS').split()])}"
277do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb" 277do_populate_sdk[recrdeptask] += "do_packagedata do_package_write_rpm do_package_write_ipk do_package_write_deb"
278addtask populate_sdk 278addtask populate_sdk