diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2012-03-09 22:34:40 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-13 11:44:46 +0000 |
| commit | 76f46391239d3e123cfde900c52ca12ac73fd84f (patch) | |
| tree | f8d3d40ebebc63e6e3caf7b363fa7c606043519c | |
| parent | 3d3a7103f4d068caed202833ffe9db6b47e75082 (diff) | |
| download | openembedded-core-contrib-76f46391239d3e123cfde900c52ca12ac73fd84f.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.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
| -rw-r--r-- | meta/classes/package.bbclass | 4 |
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 mainpkg = mainpkg.replace('-dev', '') extra_depends = mainpkg - for o in objs: + for o in sorted(objs): import re, stat if match_path: m = re.match(file_regex, o) @@ -415,7 +415,7 @@ python package_do_split_locales() { summary = d.getVar('SUMMARY', True) or pn description = d.getVar('DESCRIPTION', True) or "" locale_section = d.getVar('LOCALE_SECTION', True) - for l in locales: + for l in sorted(locales): ln = legitimize_package_name(l) pkg = pn + '-locale-' + ln packages.append(pkg) |