From 6769bb83f9629997be369a985aba322e03d8d0c3 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 7 Oct 2021 11:14:18 +0100 Subject: [PATCH] rpm: Deterministically set vendor macro entry On an aarch64 build host, vendor is found to be "unknown", on x86 systems it is "pc". This filters through to the PLATFORM tag in target rpms. We saw reproducibility test failures where the PLATFORM tags in noarch rpms were changing depending upon which host built them. Forcing the vendor value to a consistent one makes things deterministic. (From OE-Core rev: ef37fca2f434eba22918e5eab4f2d5e2d499fc14) Signed-off-by: Richard Purdie (cherry picked from commit f6434075b2bdfc23c683d22281b674b1e6abde77) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- meta/recipes-devtools/rpm/rpm_4.16.1.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb index 0b58a24b99..ea1cc38806 100644 --- a/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb +++ b/meta/recipes-devtools/rpm/rpm_4.16.1.3.bb @@ -59,7 +59,8 @@ AUTOTOOLS_AUXDIR = "${S}/build-aux" # OE-core patches autoreconf to additionally run gnu-configize, which fails with this recipe EXTRA_AUTORECONF_append = " --exclude=gnu-configize" -EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=libgcrypt" +# Vendor is detected differently on x86 and aarch64 hosts and can feed into target packages +EXTRA_OECONF_append = " --without-lua --enable-python --with-crypto=libgcrypt --with-vendor=pc" EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp" # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs