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-02 16:06:24 (GMT)
commit541c5c7fc059fa916d3631f9f97a836beaee3324 (patch)
tree2c82069f1f738f8ae75000be6eda783a9b451463
parent8dfa0e5d4635f291d24a89945fbdfb456a9f1882 (diff)
downloadpoky-541c5c7fc059fa916d3631f9f97a836beaee3324.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: af9eb2ef36cb5bfd87ea61ff3390949810097c9b) Signed-off-by: Ross Burton <ross.burton@intel.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 563582e..bed928e 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 ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}" 20SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}"
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"
@@ -39,7 +42,7 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
39TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}" 42TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
40 43
41SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}" 44SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
42SDK_DEPENDS = "virtual/fakeroot-native pixz-native" 45SDK_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
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 8b8a341..9be2d47 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -618,7 +618,8 @@ fakeroot python do_populate_sdk_ext() {
618 d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d)) 618 d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d))
619 d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn) 619 d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn)
620 d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}') 620 d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}')
621 621 # ESDKs have a libc from the buildtools so ensure we don't ship linguas twice
622 d.delVar('SDKIMAGE_LINGUAS')
622 populate_sdk_common(d) 623 populate_sdk_common(d)
623} 624}
624 625
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index abdc7fe..474b928 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -21,7 +21,6 @@ TOOLCHAIN_HOST_TASK ?= "\
21 nativesdk-wget \ 21 nativesdk-wget \
22 nativesdk-ca-certificates \ 22 nativesdk-ca-certificates \
23 nativesdk-texinfo \ 23 nativesdk-texinfo \
24 nativesdk-locale-base-en-us \
25 " 24 "
26 25
27MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" 26MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"