mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-20 03:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

package.bbclass: Make package output files more deterministic

Browse Source 
Observing depsig.do_package for packages inbetween rebuilds indicated
that the following variables/files content was changing order randomly.
Make them deterministic by sorting the output:

 RDEPENDS_<pkg>
 RRECOMMENDS_<pkg>
 FILERDEPENDSFLIST_<pkg>

 packages-split/<pkg>.shlibdeps

The following variable was not observed to change, but it is
assumed that the same situation can occur, so do the same
sorting for consistency:

 FILERPROVIDESFLIST_<pkg>

(From OE-Core rev: c99cb0bbb78089d1d15c4c8563a71db0df1cb0da)

Signed-off-by: Jacob Kroon <jacob.kroon@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jacob Kroon
2019-01-10 23:45:16 +01:00
committed by Richard Purdie
parent 1b15b02b11
commit 889d9e037f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
meta/classes/package.bbclass
View File

@@ -1562,12 +1562,12 @@ python package_do_filedeps() {
if pkg not in requires_files: if pkg not in requires_files:
requires_files[pkg] = [] requires_files[pkg] = []
for file in provides: for file in sorted(provides):
provides_files[pkg].append(file) provides_files[pkg].append(file)
key = "FILERPROVIDES_" + file + "_" + pkg key = "FILERPROVIDES_" + file + "_" + pkg
d.appendVar(key, " " + " ".join(provides[file])) d.appendVar(key, " " + " ".join(provides[file]))
for file in requires: for file in sorted(requires):
requires_files[pkg].append(file) requires_files[pkg].append(file)
key = "FILERDEPENDS_" + file + "_" + pkg key = "FILERDEPENDS_" + file + "_" + pkg
d.appendVar(key, " " + " ".join(requires[file])) d.appendVar(key, " " + " ".join(requires[file]))
@@ -1868,7 +1868,7 @@ python package_do_shlibs() {
os.remove(deps_file) os.remove(deps_file)
if len(deps): if len(deps):
fd = open(deps_file, 'w') fd = open(deps_file, 'w')
for dep in deps: for dep in sorted(deps):
fd.write(dep + '\n') fd.write(dep + '\n')
fd.close() fd.close()
} }
@@ -1989,7 +1989,7 @@ python read_shlibdeps () {
packages = d.getVar('PACKAGES').split() packages = d.getVar('PACKAGES').split()
for pkg in packages: for pkg in packages:
rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg) or "") rdepends = bb.utils.explode_dep_versions2(d.getVar('RDEPENDS_' + pkg) or "")
for dep in pkglibdeps[pkg]: for dep in sorted(pkglibdeps[pkg]):
# Add the dep if it's not already there, or if no comparison is set # Add the dep if it's not already there, or if no comparison is set
if dep not in rdepends: if dep not in rdepends:
rdepends[dep] = [] rdepends[dep] = []
@@ -2022,7 +2022,7 @@ python package_depchains() {
#bb.note('depends for %s is %s' % (base, depends)) #bb.note('depends for %s is %s' % (base, depends))
rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "") rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
for depend in depends: for depend in sorted(depends):
if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'): if depend.find('-native') != -1 or depend.find('-cross') != -1 or depend.startswith('virtual/'):
#bb.note("Skipping %s" % depend) #bb.note("Skipping %s" % depend)
continue continue
@@ -2043,7 +2043,7 @@ python package_depchains() {
#bb.note('rdepends for %s is %s' % (base, rdepends)) #bb.note('rdepends for %s is %s' % (base, rdepends))
rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "") rreclist = bb.utils.explode_dep_versions2(d.getVar('RRECOMMENDS_' + pkg) or "")
for depend in rdepends: for depend in sorted(rdepends):
if depend.find('virtual-locale-') != -1: if depend.find('virtual-locale-') != -1:
#bb.note("Skipping %s" % depend) #bb.note("Skipping %s" % depend)
continue continue