diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-24 21:51:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-10 00:22:51 +0000 |
commit | b252b0285a2ca683e5e9b04e614346b8312d8cfd (patch) | |
tree | 7149bb57f8ea4a47f27b6ad315de904b83497941 /meta/classes | |
parent | 39e48aae92d103fc35ccbac2c801e3842aba9ea3 (diff) | |
download | poky-b252b0285a2ca683e5e9b04e614346b8312d8cfd.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: 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>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/package_rpm.bbclass | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 15bff9c778..3ff74c9f31 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1620,7 +1620,7 @@ if [ x"$D" = "x" ]; then | |||
1620 | fi | 1620 | fi |
1621 | } | 1621 | } |
1622 | 1622 | ||
1623 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps" | 1623 | RPMDEPS = "${STAGING_LIBDIR_NATIVE}/rpm/rpmdeps --alldeps --define '__font_provides %{nil}'" |
1624 | 1624 | ||
1625 | # Collect perfile run-time dependency metadata | 1625 | # Collect perfile run-time dependency metadata |
1626 | # Output: | 1626 | # Output: |
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 95731c7d8d..7de409197e 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
@@ -683,6 +683,7 @@ python do_package_rpm () { | |||
683 | cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" | 683 | cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" |
684 | cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" | 684 | cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" |
685 | cmd = cmd + " --define '_buildhost reproducible'" | 685 | cmd = cmd + " --define '_buildhost reproducible'" |
686 | cmd = cmd + " --define '__font_provides %{nil}'" | ||
686 | if perfiledeps: | 687 | if perfiledeps: |
687 | cmd = cmd + " --define '__find_requires " + outdepends + "'" | 688 | cmd = cmd + " --define '__find_requires " + outdepends + "'" |
688 | cmd = cmd + " --define '__find_provides " + outprovides + "'" | 689 | cmd = cmd + " --define '__find_provides " + outprovides + "'" |