summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-06-13 14:56:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-14 12:56:32 +0100
commit7f6d7f729df37747be0d2cd2503cddca0184fd1f (patch)
tree2c2058f3f3329cac0fe4593ac8c3d2e1e6df40e4
parenta70f6611baaf6705b85b73feff7babc2494efcbd (diff)
downloadopenembedded-core-contrib-7f6d7f729df37747be0d2cd2503cddca0184fd1f.tar.gz
openembedded-core-contrib-7f6d7f729df37747be0d2cd2503cddca0184fd1f.tar.bz2
openembedded-core-contrib-7f6d7f729df37747be0d2cd2503cddca0184fd1f.zip
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. Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/libc-package.bbclass3
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 () {
# GLIBC_GENERATE_LOCALES var specifies which locales to be generated. empty or "all" means all locales
to_generate = d.getVar('GLIBC_GENERATE_LOCALES', True)
if not to_generate or to_generate == 'all':
- to_generate = supported.keys()
+ to_generate = sorted(supported.keys())
else:
to_generate = to_generate.split()
for locale in to_generate:
@@ -391,4 +391,3 @@ python package_do_split_gconvs () {
python populate_packages_prepend () {
bb.build.exec_func('package_do_split_gconvs', d)
}
-