summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-24 21:51:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-02-26 15:21:20 +0000
commit61d9c0b77bedf1d6d37437447eb6b154c2d84a78 (patch)
tree66f11da36b22d360295d51900e24e8966055f1c7
parent07176f26099e65f2c6434ba7541ec528db6d3f9c (diff)
downloadpoky-61d9c0b77bedf1d6d37437447eb6b154c2d84a78.tar.gz
package/package_rpm: Disable font_provides configuration for reproducibilty
The host may or may not have fc-cache which is used for find provides information by rpmdeps. This lead to non-deterministic build output. Disable the font provides code so we have deterministic builds, we have nothing using/relying on it at this point. Need to disable this in both the rpmdeps code and in package_rpm itself although the latter shouldn't be being used. (From OE-Core rev: 1c0cd8012a96fd4d9caf33c6de5fd39cea6db55d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 417e225297..e3f0a7060b 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1710,7 +1710,7 @@ if [ x"$D" = "x" ]; then
1710fi 1710fi
1711} 1711}
1712 1712
1713RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps" 1713RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps --define '__font_provides %{nil}'"
1714 1714
1715# Collect perfile run-time dependency metadata 1715# Collect perfile run-time dependency metadata
1716# Output: 1716# Output:
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index c1824306ee..84a9a6dd12 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -689,6 +689,7 @@ python do_package_rpm () {
689 cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" 689 cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'"
690 cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" 690 cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'"
691 cmd = cmd + " --define '_buildhost reproducible'" 691 cmd = cmd + " --define '_buildhost reproducible'"
692 cmd = cmd + " --define '__font_provides %{nil}'"
692 if perfiledeps: 693 if perfiledeps:
693 cmd = cmd + " --define '__find_requires " + outdepends + "'" 694 cmd = cmd + " --define '__find_requires " + outdepends + "'"
694 cmd = cmd + " --define '__find_provides " + outprovides + "'" 695 cmd = cmd + " --define '__find_provides " + outprovides + "'"