diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 5 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 3 |
2 files changed, 6 insertions, 2 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 |
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index c79ddbbb81..2dd21237e2 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -657,7 +657,8 @@ fakeroot python do_populate_sdk_ext() { | |||
657 | d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d)) | 657 | d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d)) |
658 | d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn) | 658 | d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn) |
659 | d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}') | 659 | d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}') |
660 | 660 | # ESDKs have a libc from the buildtools so ensure we don't ship linguas twice | |
661 | d.delVar('SDKIMAGE_LINGUAS') | ||
661 | populate_sdk_common(d) | 662 | populate_sdk_common(d) |
662 | } | 663 | } |
663 | 664 | ||