summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-06 23:58:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:01 +0000
commit468575f9733e6a397264a92c6a2b3c7afa88bce6 (patch)
treed9da5eea9f6ecda9fd61183bb4cf340bd60a7b0b /meta/recipes-support
parentc0726d98e64535374af04c583d59e4f5d1bc6238 (diff)
downloadpoky-468575f9733e6a397264a92c6a2b3c7afa88bce6.tar.gz
libgcrypt: Fix determinism issue
The build was injection git information from the wrong git tree, stop this to allow reproducible builds. (From OE-Core rev: 506b36b6d86b3454fcc3cb85f6229cbe8d14f5b5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libgcrypt/files/determinism.patch32
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb1
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch
new file mode 100644
index 0000000000..ad0b8c7950
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/determinism.patch
@@ -0,0 +1,32 @@
1gnutls detects our outer git trees and injects that revision into its objects.
2That isn't deterministic so stop it. Also ensure we're not marked as a development
3build as its git detection is faulty.
4
5RP 2020/2/6
6
7Upstream-Status: Pending
8Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9
10
11Index: libgcrypt-1.8.5/configure.ac
12===================================================================
13--- libgcrypt-1.8.5.orig/configure.ac
14+++ libgcrypt-1.8.5/configure.ac
15@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec],
16 m4_define([mym4_betastring],
17 m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\
18 awk -F- '$3!=0{print"-beta"$3}']))
19-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
20+m4_define([mym4_isgit],[no])
21 m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
22
23 AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org])
24@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui
25 #
26 # Provide information about the build.
27 #
28-BUILD_REVISION="mym4_revision"
29+BUILD_REVISION="None"
30 AC_SUBST(BUILD_REVISION)
31 AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
32 [GIT commit id revision used to build this package])
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb
index 04785574f2..4e0eb0a169 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.5.bb
@@ -24,6 +24,7 @@ SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
24 file://0001-Prefetch-GCM-look-up-tables.patch \ 24 file://0001-Prefetch-GCM-look-up-tables.patch \
25 file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \ 25 file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \
26 file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \ 26 file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \
27 file://determinism.patch \
27" 28"
28SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743" 29SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743"
29SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3" 30SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3"