diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 5 | ||||
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 3 | ||||
-rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 563582e0a0..bed928e154 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 8b8a341e3e..9be2d47d0d 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 abdc7feeb8..474b928c1b 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 | ||
27 | MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" | 26 | MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" |