All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Steve Sakoman" <steve@sakoman.com>
To: openembedded-core@lists.openembedded.org
Subject: [OE-core][dunfell 21/27] package/package_rpm: Disable font_provides configuration for reproducibilty
Date: Fri,  5 Mar 2021 04:46:30 -1000	[thread overview]
Message-ID: <ed1fbc5a33ea6e6cdcfd4749153b51338b132619.1614955420.git.steve@sakoman.com> (raw)
In-Reply-To: <cover.1614955420.git.steve@sakoman.com>

From: Richard Purdie <richard.purdie@linuxfoundation.org>

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>
(cherry picked from commit 1c0cd8012a96fd4d9caf33c6de5fd39cea6db55d)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 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 + "'"
-- 
2.25.1


  parent reply	other threads:[~2021-03-05 14:48 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-05 14:46 [OE-core][dunfell 00/27] Patch review Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 01/27] openssl: upgrade 1.1.1i -> 1.1.1j Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 02/27] linux-firmware: upgrade 20201218 -> 20210208 Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 03/27] python3: fix CVE-2021-3177 Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 04/27] screen: fix CVE-2021-26937 Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 05/27] bind: fix CVE-2020-8625 Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 06/27] wpa-supplicant: fix CVE-2021-0326 Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 07/27] libsdl2: fix CVE-2020-14409 CVE-2020-14410 Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 08/27] librepo: fix CVE-2020-14352 Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 09/27] sstatesig.py: show an error instead of warning when sstate manifest isn't found Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 10/27] image: Add directories to PSEUDO_IGNORE_PATHS Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 11/27] populate_sdk: " Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 12/27] bitbake.conf/image: Move image specific PSEUDO_IGNORE_PATHS to image class Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 13/27] bitbake.conf: Split PSEUDO_IGNORE_PATHS to be more readable Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 14/27] maintainers: Update email address for Victor Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 15/27] libevdev: Update patch status to backport Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 16/27] ca-certificates: Clean up two patches and submit upstream Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 17/27] libpcre: Drop old/stale patch Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 18/27] report-error.bbclass: Add layer and bitbake version info to error report Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 19/27] reproducible_builds: SOURCE_DATE_EPOCH should not be 0 Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 20/27] reproducible: Improve SOURCE_DATE_EPOCH_FALLBACK handling Steve Sakoman
2021-03-05 14:46 ` Steve Sakoman [this message]
2021-03-05 14:46 ` [OE-core][dunfell 22/27] asciidoc: Switch to using the main branch Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 23/27] cups: Fix reproducibility issues Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 24/27] meta/recipes-bsp: Add HOMEPAGE / DESCRIPTION Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 25/27] meta/recipes-connectivity: " Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 26/27] meta/recipes-devtools: " Steve Sakoman
2021-03-05 14:46 ` [OE-core][dunfell 27/27] meta/recipes-core: " Steve Sakoman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ed1fbc5a33ea6e6cdcfd4749153b51338b132619.1614955420.git.steve@sakoman.com \
    --to=steve@sakoman.com \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.