diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-12 13:30:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-20 11:53:49 +0000 |
commit | b0f70c5f9e423b37260bf3f3c105095ba4c39afb (patch) | |
tree | dc9bc59c5d27c38822fdae912f06c3c824b383f4 | |
parent | 41fb482ee132289e8663c76b813a6e3c86e201b3 (diff) | |
download | poky-b0f70c5f9e423b37260bf3f3c105095ba4c39afb.tar.gz |
staging: Add dependency on virtual/binutils for strip binary
The staging code strips binaries and we need virtual/binutils for that.
Add a specific dependency since the one from do_configure and others
may not be enough to ensure the binaries are in our own sysroot.
(From OE-Core rev: 9a799f70574ee8e0b1267497edfb4ac63166ef8f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 () { | |||
32 | d.setVar("TARGET_CFLAGS", "none") | 32 | d.setVar("TARGET_CFLAGS", "none") |
33 | d.setVar("TARGET_CXXFLAGS", "none") | 33 | d.setVar("TARGET_CXXFLAGS", "none") |
34 | d.setVar("TARGET_LDFLAGS", "none") | 34 | d.setVar("TARGET_LDFLAGS", "none") |
35 | d.setVar("POPULATESYSROOTDEPS", "") | ||
35 | 36 | ||
36 | # Avoid this being unnecessarily different due to nuances of | 37 | # Avoid this being unnecessarily different due to nuances of |
37 | # the target machine that aren't important for "all" arch | 38 | # 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 = "" | |||
96 | # don't want this dependency, which is causing dependency loop | 96 | # don't want this dependency, which is causing dependency loop |
97 | KERNELDEPMODDEPEND ?= "virtual/kernel:do_packagedata" | 97 | KERNELDEPMODDEPEND ?= "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 | ||
101 | do_populate_sysroot[depends] = "" | ||
102 | |||
99 | do_rootfs[depends] += " \ | 103 | do_rootfs[depends] += " \ |
100 | makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \ | 104 | makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ${LDCONFIGDEPEND} \ |
101 | virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot \ | 105 | 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 () { | |||
228 | do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" | 228 | do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" |
229 | do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" | 229 | do_populate_sysroot[vardepsexclude] += "MULTI_PROVIDER_WHITELIST" |
230 | 230 | ||
231 | POPULATESYSROOTDEPS = "" | ||
232 | POPULATESYSROOTDEPS_class-target = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot" | ||
233 | do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" | ||
234 | |||
231 | SSTATETASKS += "do_populate_sysroot" | 235 | SSTATETASKS += "do_populate_sysroot" |
232 | do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}" | 236 | do_populate_sysroot[cleandirs] = "${SYSROOT_DESTDIR}" |
233 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}" | 237 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}" |