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>
This commit is contained in:
parent
8dfa0e5d46
commit
541c5c7fc0
|
@ -20,6 +20,9 @@ def complementary_globs(featurevar, d):
|
|||
SDKIMAGE_FEATURES ??= "dev-pkgs dbg-pkgs ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'doc-pkgs', '', d)}"
|
||||
SDKIMAGE_INSTALL_COMPLEMENTARY = '${@complementary_globs("SDKIMAGE_FEATURES", d)}'
|
||||
|
||||
# List of locales to install, or "all" for all of them, or unset for none.
|
||||
SDKIMAGE_LINGUAS ?= "all"
|
||||
|
||||
inherit rootfs_${IMAGE_PKGTYPE}
|
||||
|
||||
SDK_DIR = "${WORKDIR}/sdk"
|
||||
|
@ -39,7 +42,7 @@ TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
|
|||
TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
|
||||
|
||||
SDK_RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
|
||||
SDK_DEPENDS = "virtual/fakeroot-native pixz-native"
|
||||
SDK_DEPENDS = "virtual/fakeroot-native pixz-native cross-localedef-native"
|
||||
|
||||
# We want the MULTIARCH_TARGET_SYS to point to the TUNE_PKGARCH, not PACKAGE_ARCH as it
|
||||
# could be set to the MACHINE_ARCH
|
||||
|
|
|
@ -618,7 +618,8 @@ fakeroot python do_populate_sdk_ext() {
|
|||
d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d))
|
||||
d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn)
|
||||
d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}')
|
||||
|
||||
# ESDKs have a libc from the buildtools so ensure we don't ship linguas twice
|
||||
d.delVar('SDKIMAGE_LINGUAS')
|
||||
populate_sdk_common(d)
|
||||
}
|
||||
|
||||
|
|
|
@ -21,7 +21,6 @@ TOOLCHAIN_HOST_TASK ?= "\
|
|||
nativesdk-wget \
|
||||
nativesdk-ca-certificates \
|
||||
nativesdk-texinfo \
|
||||
nativesdk-locale-base-en-us \
|
||||
"
|
||||
|
||||
MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
|
||||
|
|
Loading…
Reference in New Issue