summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-13 22:54:39 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-16 08:50:34 (GMT)
commit95fa69f3d380d3bb99e8e2ac7e1be3b9f5698fb9 (patch)
tree0dd7a7cfcd6b1d4a19ad1a89e11a42602c41a4ed /meta/classes/package.bbclass
parent516bbba02fb60e762df6ff0df80372ddb72a2494 (diff)
downloadpoky-95fa69f3d380d3bb99e8e2ac7e1be3b9f5698fb9.tar.gz
package: Fix pkgdata determinism issues
pkgdata output isn't entirely deterministic since the sorting of some of the variables can change. This likely doesn't have any real world effect but fix this with some additional sorting as it allows better hash equivalency of task output. (From OE-Core rev: a30c4de8a0b309c398c42fe710c45a4df7fcc64d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 3a78e48..460997a 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1690,11 +1690,11 @@ fi
1690 val = write_if_exists(sf, pkg, var) 1690 val = write_if_exists(sf, pkg, var)
1691 1691
1692 write_if_exists(sf, pkg, 'FILERPROVIDESFLIST') 1692 write_if_exists(sf, pkg, 'FILERPROVIDESFLIST')
1693 for dfile in (d.getVar('FILERPROVIDESFLIST:' + pkg) or "").split(): 1693 for dfile in sorted((d.getVar('FILERPROVIDESFLIST:' + pkg) or "").split()):
1694 write_if_exists(sf, pkg, 'FILERPROVIDES:' + dfile) 1694 write_if_exists(sf, pkg, 'FILERPROVIDES:' + dfile)
1695 1695
1696 write_if_exists(sf, pkg, 'FILERDEPENDSFLIST') 1696 write_if_exists(sf, pkg, 'FILERDEPENDSFLIST')
1697 for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split(): 1697 for dfile in sorted((d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split()):
1698 write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile) 1698 write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile)
1699 1699
1700 sf.write('%s:%s: %d\n' % ('PKGSIZE', pkg, total_size)) 1700 sf.write('%s:%s: %d\n' % ('PKGSIZE', pkg, total_size))
@@ -1797,9 +1797,9 @@ python package_do_filedeps() {
1797 d.appendVar(key, " " + " ".join(requires[file])) 1797 d.appendVar(key, " " + " ".join(requires[file]))
1798 1798
1799 for pkg in requires_files: 1799 for pkg in requires_files:
1800 d.setVar("FILERDEPENDSFLIST:" + pkg, " ".join(requires_files[pkg])) 1800 d.setVar("FILERDEPENDSFLIST:" + pkg, " ".join(sorted(requires_files[pkg])))
1801 for pkg in provides_files: 1801 for pkg in provides_files:
1802 d.setVar("FILERPROVIDESFLIST:" + pkg, " ".join(provides_files[pkg])) 1802 d.setVar("FILERPROVIDESFLIST:" + pkg, " ".join(sorted(provides_files[pkg])))
1803} 1803}
1804 1804
1805SHLIBSDIRS = "${WORKDIR_PKGDATA}/${MLPREFIX}shlibs2" 1805SHLIBSDIRS = "${WORKDIR_PKGDATA}/${MLPREFIX}shlibs2"