* [PATCH 1/3] iputils: Fix build determinism
@ 2020-02-07 0:00 Richard Purdie
2020-02-07 0:00 ` [PATCH 2/3] libinput: Fix determinism issue Richard Purdie
2020-02-07 0:00 ` [PATCH 3/3] libgcrypt: " Richard Purdie
0 siblings, 2 replies; 3+ messages in thread
From: Richard Purdie @ 2020-02-07 0:00 UTC (permalink / raw)
To: openembedded-core
The suid/setcap code depends on whether setcap is on the host system or not
with suid as a fallback. Disable this functionality to be deterministic.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-extended/iputils/iputils_s20190709.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/iputils/iputils_s20190709.bb b/meta/recipes-extended/iputils/iputils_s20190709.bb
index a672ccdb7c0..e0d2ae160ee 100644
--- a/meta/recipes-extended/iputils/iputils_s20190709.bb
+++ b/meta/recipes-extended/iputils/iputils_s20190709.bb
@@ -34,7 +34,8 @@ PACKAGECONFIG[docs] = "-DBUILD_HTML_MANS=true -DBUILD_MANS=true,-DBUILD_HTML_MAN
inherit meson update-alternatives
-EXTRA_OEMESON += "--prefix=${root_prefix}/"
+# Have to disable setcap/suid as its not deterministic
+EXTRA_OEMESON += "--prefix=${root_prefix}/ -DNO_SETCAP_OR_SUID=true"
ALTERNATIVE_PRIORITY = "100"
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/3] libinput: Fix determinism issue
2020-02-07 0:00 [PATCH 1/3] iputils: Fix build determinism Richard Purdie
@ 2020-02-07 0:00 ` Richard Purdie
2020-02-07 0:00 ` [PATCH 3/3] libgcrypt: " Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2020-02-07 0:00 UTC (permalink / raw)
To: openembedded-core
The build was injection git information from the wrong git tree, stop this
to allow reproducible builds.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../wayland/libinput/determinism.patch | 21 +++++++++++++++++++
.../wayland/libinput_1.14.3.bb | 1 +
2 files changed, 22 insertions(+)
create mode 100644 meta/recipes-graphics/wayland/libinput/determinism.patch
diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch
new file mode 100644
index 00000000000..cb554030cf3
--- /dev/null
+++ b/meta/recipes-graphics/wayland/libinput/determinism.patch
@@ -0,0 +1,21 @@
+This finds our outer git tree and that version information breaks
+determinism of this recipe. Disable it.
+
+RP 2020/2/6
+
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+Index: libinput-1.14.3/meson.build
+===================================================================
+--- libinput-1.14.3.orig/meson.build
++++ libinput-1.14.3/meson.build
+@@ -387,7 +387,7 @@ pkgconfig.generate(
+ libraries : lib_libinput
+ )
+
+-git_version_h = vcs_tag(command : ['git', 'describe'],
++git_version_h = vcs_tag(command : ['false'],
+ fallback : 'unknown',
+ input : 'src/libinput-git-version.h.in',
+ output :'libinput-git-version.h')
diff --git a/meta/recipes-graphics/wayland/libinput_1.14.3.bb b/meta/recipes-graphics/wayland/libinput_1.14.3.bb
index 46d46c54eeb..bc5a76dc9af 100644
--- a/meta/recipes-graphics/wayland/libinput_1.14.3.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.14.3.bb
@@ -14,6 +14,7 @@ DEPENDS = "libevdev udev mtdev"
SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
file://0001-adjust-for-64bit-time_t-for-32bit-architectures.patch \
+ file://determinism.patch \
"
SRC_URI[md5sum] = "d052faa64eb6d2e649e582cc0fcf6e32"
SRC_URI[sha256sum] = "0feb3a0589709cc1032893bfaf4c49150d5360bd9782bec888f9e4dd9044c5b7"
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 3/3] libgcrypt: Fix determinism issue
2020-02-07 0:00 [PATCH 1/3] iputils: Fix build determinism Richard Purdie
2020-02-07 0:00 ` [PATCH 2/3] libinput: Fix determinism issue Richard Purdie
@ 2020-02-07 0:00 ` Richard Purdie
1 sibling, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2020-02-07 0:00 UTC (permalink / raw)
To: openembedded-core
The build was injection git information from the wrong git tree, stop this
to allow reproducible builds.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../libgcrypt/files/determinism.patch | 32 +++++++++++++++++++
.../libgcrypt/libgcrypt_1.8.5.bb | 1 +
2 files changed, 33 insertions(+)
create mode 100644 meta/recipes-support/libgcrypt/files/determinism.patch
diff --git a/meta/recipes-support/libgcrypt/files/determinism.patch b/meta/recipes-support/libgcrypt/files/determinism.patch
new file mode 100644
index 00000000000..ad0b8c79500
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/determinism.patch
@@ -0,0 +1,32 @@
+gnutls detects our outer git trees and injects that revision into its objects.
+That isn't deterministic so stop it. Also ensure we're not marked as a development
+build as its git detection is faulty.
+
+RP 2020/2/6
+
+Upstream-Status: Pending
+Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
+
+
+Index: libgcrypt-1.8.5/configure.ac
+===================================================================
+--- libgcrypt-1.8.5.orig/configure.ac
++++ libgcrypt-1.8.5/configure.ac
+@@ -45,7 +45,7 @@ m4_define([mym4_revision_dec],
+ m4_define([mym4_betastring],
+ m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\
+ awk -F- '$3!=0{print"-beta"$3}']))
+-m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes]))
++m4_define([mym4_isgit],[no])
+ m4_define([mym4_full_version],[mym4_version[]mym4_betastring])
+
+ AC_INIT([libgcrypt],[mym4_full_version],[http://bugs.gnupg.org])
+@@ -2575,7 +2575,7 @@ AM_CONDITIONAL([BUILD_DOC], [test "x$bui
+ #
+ # Provide information about the build.
+ #
+-BUILD_REVISION="mym4_revision"
++BUILD_REVISION="None"
+ AC_SUBST(BUILD_REVISION)
+ AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
+ [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 04785574f2f..4e0eb0a1697 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 \
file://0001-Prefetch-GCM-look-up-tables.patch \
file://0002-AES-move-look-up-tables-to-.data-section-and-unshare.patch \
file://0003-GCM-move-look-up-table-to-.data-section-and-unshare-.patch \
+ file://determinism.patch \
"
SRC_URI[md5sum] = "348cc4601ca34307fc6cd6c945467743"
SRC_URI[sha256sum] = "3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3"
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-02-07 0:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-07 0:00 [PATCH 1/3] iputils: Fix build determinism Richard Purdie
2020-02-07 0:00 ` [PATCH 2/3] libinput: Fix determinism issue Richard Purdie
2020-02-07 0:00 ` [PATCH 3/3] libgcrypt: " Richard Purdie
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.