From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 2/3] libinput: Fix determinism issue
Date: Fri, 7 Feb 2020 00:00:40 +0000 [thread overview]
Message-ID: <20200207000041.19304-2-richard.purdie@linuxfoundation.org> (raw)
In-Reply-To: <20200207000041.19304-1-richard.purdie@linuxfoundation.org>
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
next prev parent reply other threads:[~2020-02-07 0:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-07 0:00 [PATCH 1/3] iputils: Fix build determinism Richard Purdie
2020-02-07 0:00 ` Richard Purdie [this message]
2020-02-07 0:00 ` [PATCH 3/3] libgcrypt: Fix determinism issue Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200207000041.19304-2-richard.purdie@linuxfoundation.org \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.