mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-03 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

package/package_rpm: Disable font_provides configuration for reproducibilty

Browse Source 
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: ed1fbc5a33ea6e6cdcfd4749153b51338b132619)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1c0cd8012a96fd4d9caf33c6de5fd39cea6db55d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2021-02-24 21:51:08 +00:00
parent 39e48aae92
commit b252b0285a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package.bbclass
+1 -1
View File
@@ -1620,7 +1620,7 @@ if [ x"$D" = "x" ]; then
fi fi
} }
RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps" RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps --define '__font_provides %{nil}'"
# Collect perfile run-time dependency metadata # Collect perfile run-time dependency metadata
# Output: # Output:
meta/classes/package_rpm.bbclass
+1
View File
@@ -683,6 +683,7 @@ python do_package_rpm () {
cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'"
cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'"
cmd = cmd + " --define '_buildhost reproducible'" cmd = cmd + " --define '_buildhost reproducible'"
cmd = cmd + " --define '__font_provides %{nil}'"
if perfiledeps: if perfiledeps:
cmd = cmd + " --define '__find_requires " + outdepends + "'" cmd = cmd + " --define '__find_requires " + outdepends + "'"
cmd = cmd + " --define '__find_provides " + outprovides + "'" cmd = cmd + " --define '__find_provides " + outprovides + "'"