From a30c4de8a0b309c398c42fe710c45a4df7fcc64d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 13 Sep 2021 23:54:39 +0100 Subject: [PATCH] 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. Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 3a78e48da4..460997ad54 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1690,11 +1690,11 @@ fi val = write_if_exists(sf, pkg, var) write_if_exists(sf, pkg, 'FILERPROVIDESFLIST') - for dfile in (d.getVar('FILERPROVIDESFLIST:' + pkg) or "").split(): + for dfile in sorted((d.getVar('FILERPROVIDESFLIST:' + pkg) or "").split()): write_if_exists(sf, pkg, 'FILERPROVIDES:' + dfile) write_if_exists(sf, pkg, 'FILERDEPENDSFLIST') - for dfile in (d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split(): + for dfile in sorted((d.getVar('FILERDEPENDSFLIST:' + pkg) or "").split()): write_if_exists(sf, pkg, 'FILERDEPENDS:' + dfile) sf.write('%s:%s: %d\n' % ('PKGSIZE', pkg, total_size)) @@ -1797,9 +1797,9 @@ python package_do_filedeps() { d.appendVar(key, " " + " ".join(requires[file])) for pkg in requires_files: - d.setVar("FILERDEPENDSFLIST:" + pkg, " ".join(requires_files[pkg])) + d.setVar("FILERDEPENDSFLIST:" + pkg, " ".join(sorted(requires_files[pkg]))) for pkg in provides_files: - d.setVar("FILERPROVIDESFLIST:" + pkg, " ".join(provides_files[pkg])) + d.setVar("FILERPROVIDESFLIST:" + pkg, " ".join(sorted(provides_files[pkg]))) } SHLIBSDIRS = "${WORKDIR_PKGDATA}/${MLPREFIX}shlibs2" -- 2.40.1