diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2015-02-18 15:40:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-21 22:05:36 +0000 |
| commit | fe66853cded794a7585ed28c519b32930979c2bc (patch) | |
| tree | a42368cdc5d8b42eae087963e302ca91af250a93 /meta/recipes-core | |
| parent | 4b69d0013dc40b1c8573ff4b03c99abf57538eaa (diff) | |
| download | ast2050-yocto-poky-fe66853cded794a7585ed28c519b32930979c2bc.zip ast2050-yocto-poky-fe66853cded794a7585ed28c519b32930979c2bc.tar.gz | |
feature-arm-thumb.inc: respect ARM_INSTRUCTION_SET when adding thumb suffix
* this means that recipes with ARM_INSTRUCTION_SET explicitly changed
to arm will be built in feed without thumb suffix, the same does apply
for workdir, e.g. after "bitbake glib-2.0" you can see:
tmp-glibc/work/armv5e-oe-linux-gnueabi:
glib-2.0 glibc glibc-initial
tmp-glibc/work/armv5te-oe-linux-gnueabi:
acl db gdk-pixbuf kmod ....
and
tmp-glibc/deploy/ipk:
all armv5e armv5te qemuarm
* feed config should be ok, because all default DEFAULTTUNEs always
include "arm" variants of all supported PACKAGE_ARCHs
* for more details see
http://lists.openembedded.org/pipermail/openembedded-core/2014-April/091960.html
the toolchain path issues were resolved in 1.8
* add ARM_INSTRUCTION_SET = "arm" to glibc-collateral.inc and comment in
glibc.inc to fix glibc-locale and glibc-scripts build
(From OE-Core rev: 3e760031f91fb87c3e2f62b77a117eb41164f259)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/glibc/glibc-collateral.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-core/glibc/glibc.inc | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc index 85e06da..dfcebae 100644 --- a/meta/recipes-core/glibc/glibc-collateral.inc +++ b/meta/recipes-core/glibc/glibc-collateral.inc @@ -2,6 +2,11 @@ INHIBIT_DEFAULT_DEPS = "1" LICENSE = "GPLv2 & LGPLv2.1" HOMEPAGE = "http://www.gnu.org/software/libc/index.html" +# This needs to match with glibc.inc, otherwise glibc-scripts and glibc-locale +# will fail to find main glibc, for details see +# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html +ARM_INSTRUCTION_SET = "arm" + do_fetch[noexec] = "1" do_unpack[noexec] = "1" do_patch[noexec] = "1" diff --git a/meta/recipes-core/glibc/glibc.inc b/meta/recipes-core/glibc/glibc.inc index 767d4b8..99a4753 100644 --- a/meta/recipes-core/glibc/glibc.inc +++ b/meta/recipes-core/glibc/glibc.inc @@ -61,6 +61,9 @@ GLIBC_EXTRA_OECONF ?= "" GLIBC_EXTRA_OECONF_class-nativesdk = "" INHIBIT_DEFAULT_DEPS = "1" +# This needs to match with glibc-collateral.inc, otherwise glibc-scripts and glibc-locale +# will fail to find main glibc, for details see +# http://lists.openembedded.org/pipermail/openembedded-core/2015-January/100679.html ARM_INSTRUCTION_SET = "arm" # glibc uses PARALLELMFLAGS variable to pass parallel build info so transfer |
