summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-01 18:26:32 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:13:47 (GMT)
commita9f439367d334667c195589e0b5025f8a0973ae2 (patch)
tree77e80b613e3a8d62d6371cdd4f999565fbce16d9
parentfc0a773246836c2f101b8108cab002d1314b5aca (diff)
downloadpoky-a9f439367d334667c195589e0b5025f8a0973ae2.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: 385dd115d00aabbcd970ef6b62353480d87a5a55) (From OE-Core rev: 065ddf01b914805298fb1ddf83ae32b5018856b3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass5
-rw-r--r--meta/classes/populate_sdk_ext.bbclass3
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb1
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 69aae26..5b298b6 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -20,6 +20,9 @@ def complementary_globs(featurevar, d):
20SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs" 20SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs"
21SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}' 21SDKIMAGE_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.
24SDKIMAGE_LINGUAS ?= "all"
25
23inherit rootfs_${IMAGE_PKGTYPE} 26inherit rootfs_${IMAGE_PKGTYPE}
24 27
25SDK_DIR = "${WORKDIR}/sdk" 28SDK_DIR = "${WORKDIR}/sdk"
@@ -42,7 +45,7 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
42TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" 45TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
43 46
44SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" 47SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
45SDK_DEPENDS = "virtual/fakeroot-native pixz-native" 48SDK_DEPENDS = "virtual/fakeroot-native pixz-native cross-localedef-native"
46 49
47# We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it 50# We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it
48# could be set to the MACHINE_ARCH 51# could be set to the MACHINE_ARCH
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 414ad8b..dedd3b0 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -622,7 +622,8 @@ fakeroot python do_populate_sdk_ext() {
622 d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d)) 622 d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d))
623 d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn) 623 d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn)
624 d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}') 624 d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}')
625 625 # ESDKs have a libc from the buildtools so ensure we don't ship linguas twice
626 d.delVar('SDKIMAGE_LINGUAS')
626 populate_sdk_common(d) 627 populate_sdk_common(d)
627} 628}
628 629
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index 5808c95..049f34a 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -23,7 +23,6 @@ TOOLCHAIN_HOST_TASK ?= "\
23 nativesdk-wget \ 23 nativesdk-wget \
24 nativesdk-ca-certificates \ 24 nativesdk-ca-certificates \
25 nativesdk-texinfo \ 25 nativesdk-texinfo \
26 nativesdk-locale-base-en-us \
27 " 26 "
28 27
29MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" 28MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"