diff options
| author | Ross Burton <ross.burton@intel.com> | 2018-03-01 18:26:31 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-05 15:13:47 +0100 |
| commit | f1de1761b35d12818f845061613919f3323694b3 (patch) | |
| tree | e461e097f40674ee74a77333a062429821c3d027 | |
| parent | eff7238cf338c2a354ed9f8aaaf761b744570913 (diff) | |
| download | poky-f1de1761b35d12818f845061613919f3323694b3.tar.gz | |
sdk: install specified locales into SDK
(From OE-Core rev: 9b1c3dbe79f67d3b46e0f90a73bce6c61f094a50)
(From OE-Core rev: f223f90d07965eef8ddbb047abd1f75da99b1c08)
(From OE-Core rev: 691925df192b4b1671ba9d19cbc3602654826451)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Fixup for getVar True bit]
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/sdk.py | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index af6ddc7602..e33e21553d 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py | |||
| @@ -84,6 +84,19 @@ class Sdk(object, metaclass=ABCMeta): | |||
| 84 | bb.debug(1, "printing the stack trace\n %s" %traceback.format_exc()) | 84 | bb.debug(1, "printing the stack trace\n %s" %traceback.format_exc()) |
| 85 | bb.warn("cannot remove SDK dir: %s" % path) | 85 | bb.warn("cannot remove SDK dir: %s" % path) |
| 86 | 86 | ||
| 87 | def install_locales(self, pm): | ||
| 88 | linguas = self.d.getVar("SDKIMAGE_LINGUAS", True) | ||
| 89 | if linguas: | ||
| 90 | if linguas == "all": | ||
| 91 | pm.install_glob("nativesdk-locale-base-*.utf-8", sdk=True) | ||
| 92 | else: | ||
| 93 | for lang in linguas.split(): | ||
| 94 | pm.install("nativesdk-locale-base-%s.utf-8" % lang) | ||
| 95 | else: | ||
| 96 | # No linguas so do nothing | ||
| 97 | pass | ||
| 98 | |||
| 99 | |||
| 87 | class RpmSdk(Sdk): | 100 | class RpmSdk(Sdk): |
| 88 | def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"): | 101 | def __init__(self, d, manifest_dir=None, rpm_workdir="oe-sdk-repo"): |
| 89 | super(RpmSdk, self).__init__(d, manifest_dir) | 102 | super(RpmSdk, self).__init__(d, manifest_dir) |
| @@ -165,6 +178,7 @@ class RpmSdk(Sdk): | |||
| 165 | 178 | ||
| 166 | bb.note("Installing NATIVESDK packages") | 179 | bb.note("Installing NATIVESDK packages") |
| 167 | self._populate_sysroot(self.host_pm, self.host_manifest) | 180 | self._populate_sysroot(self.host_pm, self.host_manifest) |
| 181 | self.install_locales(self.host_pm) | ||
| 168 | 182 | ||
| 169 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) | 183 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) |
| 170 | 184 | ||
| @@ -244,6 +258,7 @@ class OpkgSdk(Sdk): | |||
| 244 | 258 | ||
| 245 | bb.note("Installing NATIVESDK packages") | 259 | bb.note("Installing NATIVESDK packages") |
| 246 | self._populate_sysroot(self.host_pm, self.host_manifest) | 260 | self._populate_sysroot(self.host_pm, self.host_manifest) |
| 261 | self.install_locales(self.host_pm) | ||
| 247 | 262 | ||
| 248 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) | 263 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) |
| 249 | 264 | ||
| @@ -328,6 +343,7 @@ class DpkgSdk(Sdk): | |||
| 328 | 343 | ||
| 329 | bb.note("Installing NATIVESDK packages") | 344 | bb.note("Installing NATIVESDK packages") |
| 330 | self._populate_sysroot(self.host_pm, self.host_manifest) | 345 | self._populate_sysroot(self.host_pm, self.host_manifest) |
| 346 | self.install_locales(self.host_pm) | ||
| 331 | 347 | ||
| 332 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) | 348 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND", True)) |
| 333 | 349 | ||
