diff options
author | Ross Burton <ross.burton@intel.com> | 2018-03-01 18:26:32 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-26 15:07:11 +0100 |
commit | 58cfc175c4aee2755f2327a22bcc3487585160b3 (patch) | |
tree | c47261505df03030902cb4408311c5bc0749c3b8 /meta/classes/populate_sdk_base.bbclass | |
parent | 78ed353929654df871f14a3138caaa6450a33c60 (diff) | |
download | poky-58cfc175c4aee2755f2327a22bcc3487585160b3.tar.gz |
populate_sdk: install UTF-8 locales in SDKs
As glibc 2.27 can't read older locale-archives, SDKs using glibc 2.27 on hosts
using glibc earlier than 2.27 won't be able to find any locales, so bitbake
won't start and Python can't use UTF-8.
So by default install all locales into the SDK. Special-case Extensible SDKs by
installing no locales as they ship glibc in a buildtools, and that will have the
locales.
Locale installation requires cross-localedef, so add that to DEPENDS.
Also remove the explicit en_US addition in buildtools-tarball as it is now
redundant.
(From OE-Core rev: 96896568d197cd06302713c24c0f7d91bfaea6c1)
(From OE-Core rev: 8327d50ef66c94592d76b42e147011daafc6a7c3)
(From OE-Core rev: 8859d60d48918d763213470429288553adaa419c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_base.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 424c63cbfc..4d4b14f58b 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -20,6 +20,9 @@ def complementary_globs(featurevar, d): | |||
20 | SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}" | 20 | SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}" |
21 | SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' | 21 | SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' |
22 | 22 | ||
23 | # List of locales to install, or "all" for all of them, or unset for none. | ||
24 | SDKIMAGE_LINGUAS ?= "all" | ||
25 | |||
23 | inherit rootfs_${IMAGE_PKGTYPE} | 26 | inherit rootfs_${IMAGE_PKGTYPE} |
24 | 27 | ||
25 | SDK_DIR = "${WORKDIR}/sdk" | 28 | SDK_DIR = "${WORKDIR}/sdk" |
@@ -39,7 +42,7 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" | |||
39 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" | 42 | TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" |
40 | 43 | ||
41 | SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" | 44 | SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" |
42 | SDK_DEPENDS = "virtual/fakeroot-native pixz-native" | 45 | SDK_DEPENDS = "virtual/fakeroot-native pixz-native cross-localedef-native" |
43 | 46 | ||
44 | # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it | 47 | # We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it |
45 | # could be set to the MACHINE_ARCH | 48 | # could be set to the MACHINE_ARCH |