diff options
author | Ross Burton <ross.burton@intel.com> | 2018-03-01 18:26:31 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-26 15:07:11 +0100 |
commit | 46ce466e19cd238410baf383e919472ec8801b85 (patch) | |
tree | 140feb9101e31d1befcfd7b9a3733e228741cf5b | |
parent | d01564bb48a706c228563a74e19813548d8a0a0b (diff) | |
download | poky-46ce466e19cd238410baf383e919472ec8801b85.tar.gz |
sdk: install specified locales into SDK
(From OE-Core rev: 9b1c3dbe79f67d3b46e0f90a73bce6c61f094a50)
(From OE-Core rev: 680956f20788201dc439e253c8fa12e7a21ecc56)
(From OE-Core rev: 55b2052883ec579599b41260bb5cb2433dd80b51)
Signed-off-by: Ross Burton <ross.burton@intel.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 a3a6c39172..38f7b08e1c 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") | ||
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) |
@@ -166,6 +179,7 @@ class RpmSdk(Sdk): | |||
166 | 179 | ||
167 | bb.note("Installing NATIVESDK packages") | 180 | bb.note("Installing NATIVESDK packages") |
168 | self._populate_sysroot(self.host_pm, self.host_manifest) | 181 | self._populate_sysroot(self.host_pm, self.host_manifest) |
182 | self.install_locales(self.host_pm) | ||
169 | 183 | ||
170 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) | 184 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) |
171 | 185 | ||
@@ -249,6 +263,7 @@ class OpkgSdk(Sdk): | |||
249 | 263 | ||
250 | bb.note("Installing NATIVESDK packages") | 264 | bb.note("Installing NATIVESDK packages") |
251 | self._populate_sysroot(self.host_pm, self.host_manifest) | 265 | self._populate_sysroot(self.host_pm, self.host_manifest) |
266 | self.install_locales(self.host_pm) | ||
252 | 267 | ||
253 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) | 268 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) |
254 | 269 | ||
@@ -335,6 +350,7 @@ class DpkgSdk(Sdk): | |||
335 | 350 | ||
336 | bb.note("Installing NATIVESDK packages") | 351 | bb.note("Installing NATIVESDK packages") |
337 | self._populate_sysroot(self.host_pm, self.host_manifest) | 352 | self._populate_sysroot(self.host_pm, self.host_manifest) |
353 | self.install_locales(self.host_pm) | ||
338 | 354 | ||
339 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) | 355 | execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_POST_HOST_COMMAND")) |
340 | 356 | ||