[OE-core] [PATCH] libc-package: ensure glibc-locale package list is deterministic

Ross Burton ross.burton at intel.com
Mon Jun 13 13:56:08 UTC 2016


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 at intel.com>
---
 meta/classes/libc-package.bbclass | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/classes/libc-package.bbclass b/meta/classes/libc-package.bbclass
index 70f479b..4f321d4 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)
 }
-
-- 
2.8.0.rc3




More information about the Openembedded-core mailing list