From ed1fbc5a33ea6e6cdcfd4749153b51338b132619 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 24 Feb 2021 21:51:08 +0000 Subject: 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 (cherry picked from commit 1c0cd8012a96fd4d9caf33c6de5fd39cea6db55d) Signed-off-by: Steve Sakoman --- meta/classes/package.bbclass | 2 +- meta/classes/package_rpm.bbclass | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 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 95731c7d8d..7de409197e 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -683,6 +683,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 + "'" -- cgit 1.2.3-korg