diff mbox series

[mickledore,16/20] gnupg: Fix reproducibility failure

Message ID 8224e8cf402966a1108fe7035da9ed463f3d976a.1693064194.git.steve@sakoman.com
State Accepted, archived
Commit 1feb5274db6e985e10f58359b148dabb4076917a
Headers show
Series [mickledore,01/20] curl: fix CVE-2023-32001 | expand

Commit Message

Steve Sakoman Aug. 26, 2023, 3:38 p.m. UTC 
From: Richard Purdie <richard.purdie@linuxfoundation.org>

yat2m can be found within the build or from the recipe-sysroot-native if
runtime dependencies are present. The sysroot version has version differences
to the in tree copy. Specify the one we want to make the build determinstic.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1feb5274db6e985e10f58359b148dabb4076917a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
---
 meta/recipes-support/gnupg/gnupg_2.4.2.bb | 2 ++
 1 file changed, 2 insertions(+)
diff mbox series

Patch

diff --git a/meta/recipes-support/gnupg/gnupg_2.4.2.bb b/meta/recipes-support/gnupg/gnupg_2.4.2.bb
index 580782037e..631df8ac9d 100644
--- a/meta/recipes-support/gnupg/gnupg_2.4.2.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.4.2.bb
@@ -33,6 +33,8 @@  EXTRA_OECONF = "--disable-ldap \
 		--with-mailprog=${sbindir}/sendmail \
 		--enable-gpg-is-gpg2 \
                "
+# yat2m can be found from recipe-sysroot-native non-deterministically with different versioning otherwise
+CACHED_CONFIGUREVARS += "ac_cv_path_YAT2M=./yat2m"
 
 # A minimal package containing just enough to run gpg+gpgagent (E.g. use gpgme in opkg)
 PACKAGES =+ "${PN}-gpg"