summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-03-09 22:34:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-13 11:45:12 +0000
commitb9027a94163d8eb27efc464e9f1ad8159dd69c33 (patch)
tree990a1e2c88ba47a10dc4bf7877f47d00906a8ec3
parente9fdfbbcde4525ab2f82dbac086b3caa86521d6f (diff)
downloadpoky-b9027a94163d8eb27efc464e9f1ad8159dd69c33.tar.gz
package.bbclass: sort dynamically generated packages
* do_split_packages and package_do_split_locales dynamically add packages in order of appearance of os.walk() or os.listdir(). This order varies between multiple build hosts (and probably also between successive builds). * Sort the list of dynamically added packages, to get a consistent and reproducible order. * This reduces the diffs in buildhistory and improves comparability between builds. (From OE-Core rev: 76f46391239d3e123cfde900c52ca12ac73fd84f) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 9b6862decf..7bcfa02755 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -116,7 +116,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
116 mainpkg = mainpkg.replace('-dev', '') 116 mainpkg = mainpkg.replace('-dev', '')
117 extra_depends = mainpkg 117 extra_depends = mainpkg
118 118
119 for o in objs: 119 for o in sorted(objs):
120 import re, stat 120 import re, stat
121 if match_path: 121 if match_path:
122 m = re.match(file_regex, o) 122 m = re.match(file_regex, o)
@@ -415,7 +415,7 @@ python package_do_split_locales() {
415 summary = d.getVar('SUMMARY', True) or pn 415 summary = d.getVar('SUMMARY', True) or pn
416 description = d.getVar('DESCRIPTION', True) or "" 416 description = d.getVar('DESCRIPTION', True) or ""
417 locale_section = d.getVar('LOCALE_SECTION', True) 417 locale_section = d.getVar('LOCALE_SECTION', True)
418 for l in locales: 418 for l in sorted(locales):
419 ln = legitimize_package_name(l) 419 ln = legitimize_package_name(l)
420 pkg = pn + '-locale-' + ln 420 pkg = pn + '-locale-' + ln
421 packages.append(pkg) 421 packages.append(pkg)