diff options
| -rw-r--r-- | meta/classes/allarch.bbclass | 1 | ||||
| -rw-r--r-- | meta/classes/image.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/staging.bbclass | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/allarch.bbclass b/meta/classes/allarch.bbclass index 9dce49879a..026214ea9a 100644 --- a/meta/classes/allarch.bbclass +++ b/meta/classes/allarch.bbclass @@ -32,6 +32,7 @@ python () { d.setVar("TARGET_CFLAGS", "none") d.setVar("TARGET_CXXFLAGS", "none") d.setVar("TARGET_LDFLAGS", "none") + d.setVar("POPULATESYSROOTDEPS", "") # Avoid this being unnecessarily different due to nuances of # the target machine that aren't important for "all" arch diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 04fd5f9961..6b0864913b 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -96,6 +96,10 @@ 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 \ diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 72a7421ba6..2512ae6f5d 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -228,6 +228,10 @@ python do_populate_sysroot () { do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" +POPULATESYSROOTDEPS = "" +POPULATESYSROOTDEPS_class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" +do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" + SSTATETASKS += "do_populate_sysroot" do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}" do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}" |