diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-24 21:51:08 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-26 15:19:27 +0000 |
| commit | 1c0cd8012a96fd4d9caf33c6de5fd39cea6db55d (patch) | |
| tree | 8c04cccb31eb78cf381b76cc6a5b8cc415972aea /meta/classes | |
| parent | 86aacbc889830846150ff2d0f1cd7ba00a2c10f6 (diff) | |
| download | openembedded-core-contrib-1c0cd8012a96fd4d9caf33c6de5fd39cea6db55d.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.
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 417e225297..e3f0a7060b 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1710,7 +1710,7 @@ if [ x"$D" = "x" ]; then 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 # 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 () { cmd = cmd + " --define 'clamp_mtime_to_source_date_epoch 1'" cmd = cmd + " --define 'use_source_date_epoch_as_buildtime 1'" cmd = cmd + " --define '_buildhost reproducible'" + cmd = cmd + " --define '__font_provides %{nil}'" if perfiledeps: cmd = cmd + " --define '__find_requires " + outdepends + "'" cmd = cmd + " --define '__find_provides " + outprovides + "'" |