summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-04-05 14:51:31 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-08 22:48:06 +0100
commit007ebc84979b1bc8b7520097793c7ab6d646c243 (patch)
treee7d680b0287fab1e0ec7f0fcf8e6506a1ca611ae /meta
parentccd2faca99331e010badbb78d42b0ee644ca1a0a (diff)
downloadopenembedded-core-007ebc84979b1bc8b7520097793c7ab6d646c243.tar.gz
openembedded-core-007ebc84979b1bc8b7520097793c7ab6d646c243.tar.bz2
openembedded-core-007ebc84979b1bc8b7520097793c7ab6d646c243.zip
license.bbclass: improve reproducibility
Two identical builds can end up having deploy/licenses folders that differ. This is observed in cases where there are several different license files of the same name in different folders, i.e. "COPYING". In those case we have to differentiate the files somehow and we do it via file expensions such as COPYING.0, COPYING.1. However, which file will get which extension is presently random. This means, for example, that COPYING.0 in one build is the same as COPYING.1 in the other (and vice versa). Although there is mothing wrong with this, for the sake of binary reproducibility it is preferable to have a deterministic outcome. Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 81458e797b..d4be478166 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -505,7 +505,7 @@ def find_license_files(d):
bb.warn("%s: Failed to parse it's LICENSE field." % (d.getVar('PF')))
# Add files from LIC_FILES_CHKSUM to list of license files
lic_chksum_paths = defaultdict(OrderedDict)
- for path, data in lic_chksums.items():
+ for path, data in sorted(lic_chksums.items()):
lic_chksum_paths[os.path.basename(path)][data] = (os.path.join(srcdir, path), data[1], data[2])
for basename, files in lic_chksum_paths.items():
if len(files) == 1: