diff options
author | Ross Burton <ross.burton@intel.com> | 2016-06-13 14:56:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 08:35:02 +0100 |
commit | 5c94a498e8ed3acad38bee1590710056768dac53 (patch) | |
tree | d2dfee279c1e3bd1a22bdc06dc99ec8814dd3332 /meta/classes | |
parent | 87d4da4db42b69076384338709d3662b82c0c026 (diff) | |
download | poky-5c94a498e8ed3acad38bee1590710056768dac53.tar.gz |
libc-package: ensure glibc-locale package list is deterministic
If all locales are being generated then the list used is the keys from a
dictionary. In Python 3.4 onwards the ordering of a dictionary changes for
every instance, so sort the key list.
(From OE-Core rev: 7f6d7f729df37747be0d2cd2503cddca0184fd1f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/libc-package.bbclass | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass index 70f479bb41..4f321d4865 100644 --- a/meta/classes/libc-package.bbclass +++ b/meta/classes/libc-package.bbclass | |||
@@ -226,7 +226,7 @@ python package_do_split_gconvs () { | |||
226 | # GLIBC_GENERATE_LOCALES var specifies which locales to be generated. empty or "all" means all locales | 226 | # GLIBC_GENERATE_LOCALES var specifies which locales to be generated. empty or "all" means all locales |
227 | to_generate = d.getVar('GLIBC_GENERATE_LOCALES', True) | 227 | to_generate = d.getVar('GLIBC_GENERATE_LOCALES', True) |
228 | if not to_generate or to_generate == 'all': | 228 | if not to_generate or to_generate == 'all': |
229 | to_generate = supported.keys() | 229 | to_generate = sorted(supported.keys()) |
230 | else: | 230 | else: |
231 | to_generate = to_generate.split() | 231 | to_generate = to_generate.split() |
232 | for locale in to_generate: | 232 | for locale in to_generate: |
@@ -391,4 +391,3 @@ python package_do_split_gconvs () { | |||
391 | python populate_packages_prepend () { | 391 | python populate_packages_prepend () { |
392 | bb.build.exec_func('package_do_split_gconvs', d) | 392 | bb.build.exec_func('package_do_split_gconvs', d) |
393 | } | 393 | } |
394 | |||