From: Denys Dmytriyenko <[email protected]> Looks like external-arm-toolchain has broken locale packaging, so disable those dependencies for now.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/conf/distro/arago.conf | 4 +++ .../conf/distro/include/toolchain-arm.inc | 1 - .../include/tclibc-external-arm-toolchain.inc | 38 ---------------------- 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 meta-arago-extras/conf/distro/include/tclibc-external-arm-toolchain.inc diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf index deaa42b..c5d33e3 100644 --- a/meta-arago-distro/conf/distro/arago.conf +++ b/meta-arago-distro/conf/distro/arago.conf @@ -72,6 +72,10 @@ INITRAMFS_FSTYPES_k2l-hs-evm = "cpio.gz" # Mask any broken recipes (currently none) #BBMASK = "" +TMPDIR .= "-${ARMPKGARCH}-${TCMODE}" + +LIBC_DEPENDENCIES_remove = "glibc-gconv-cp1252 glibc-gconv-ibm850 glibc-gconv-iso8859-1 glibc-gconv-iso8859-15 glibc-localedata-i18n" + # Start with default set of distro features DISTRO_FEATURES = "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC}" diff --git a/meta-arago-distro/conf/distro/include/toolchain-arm.inc b/meta-arago-distro/conf/distro/include/toolchain-arm.inc index c5520ed..d2c2b2f 100644 --- a/meta-arago-distro/conf/distro/include/toolchain-arm.inc +++ b/meta-arago-distro/conf/distro/include/toolchain-arm.inc @@ -1,6 +1,5 @@ # Select external binary prebuilt Arm toolchain TCMODE = "external-arm" -TCLIBC = "external-arm-toolchain" EAT_TARGET_SYS_ARMV5 ?= "arm-none-linux-gnueabi" EAT_TARGET_SYS_ARMV7 ?= "arm-none-linux-gnueabihf" diff --git a/meta-arago-extras/conf/distro/include/tclibc-external-arm-toolchain.inc b/meta-arago-extras/conf/distro/include/tclibc-external-arm-toolchain.inc deleted file mode 100644 index 934b71b..0000000 --- a/meta-arago-extras/conf/distro/include/tclibc-external-arm-toolchain.inc +++ /dev/null @@ -1,38 +0,0 @@ -# -# external Arm glibc specific configuration -# - -LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION') or '') != '']}" - -# Add glibc overrides to the overrides for glibc. -LIBCOVERRIDE = ":libc-glibc" -OVERRIDES .= "${LIBCOVERRIDE}" - -PREFERRED_PROVIDER_virtual/libc-locale ?= "external-arm-toolchain" - -PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-glibc" -PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-glibc" - -LIBC_DEPENDENCIES = "libsegfault \ - glibc \ - glibc-dbg \ - glibc-dev \ - glibc-utils \ - glibc-thread-db \ - ${@get_libc_locales_dependencies(d)}" - -LIBC_LOCALE_DEPENDENCIES = "\ - glibc-localedata-i18n \ - glibc-gconv-ibm850 \ - glibc-gconv-cp1252 \ - glibc-gconv-iso8859-1 \ - glibc-gconv-iso8859-15 \ - locale-base-en-us \ - locale-base-en-gb" - -def get_libc_locales_dependencies(d): - if 'libc-locales' in (d.getVar('DISTRO_FEATURES') or '').split() : - return d.getVar('LIBC_LOCALE_DEPENDENCIES') or '' - else: - return '' -- 2.7.4 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
