]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
rpm: override curl executable search with just 'curl'
authorAlexander Kanavin <alex.kanavin@gmail.com>
Fri, 2 Feb 2024 13:23:52 +0000 (14:23 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 3 Feb 2024 21:41:19 +0000 (21:41 +0000)
rpm is searching for curl executable at do_configure time
and result is non-deterministic, depending on whether curl
is in native sysroot or not:
https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20240201-8dcic6ea/packages/diff-html/

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/rpm/rpm_4.19.1.bb

index af11dec5ef3335fe2a345f48ca60398518c5d4fc..086f100229b5afbf2818b119cf156602ee3b5ece 100644 (file)
@@ -51,6 +51,7 @@ S = "${WORKDIR}/git"
 DEPENDS = "lua libgcrypt file popt xz bzip2 elfutils python3 sqlite3 zstd"
 DEPENDS:append:class-native = " file-replacement-native bzip2-replacement-native"
 
+EXTRA_OECMAKE:append = " -D__CURL:FILEPATH=curl"
 EXTRA_OECMAKE:append:libc-musl = " -DENABLE_NLS=OFF -DENABLE_OPENMP=OFF"
 
 # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs