summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-06 23:57:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-11 23:05:13 +0000
commit8b96d020f5359065a76bca112a384313fc6e1ce7 (patch)
tree59767ed3bdfb12bdd174b59ec63192c92bf0bd28 /meta/recipes-graphics/wayland
parentb7138f18b616b27ee7c4850f2ee09a76a56415dd (diff)
downloadpoky-8b96d020f5359065a76bca112a384313fc6e1ce7.tar.gz
libinput: Fix determinism issue
The build was injection git information from the wrong git tree, stop this to allow reproducible builds. (From OE-Core rev: c3f6a6113f562ecdb13386c3ff52adb7973980a4) (From OE-Core rev: 22dc9a3314eef5925241a9a961bd79815d3172b6) (From OE-Core rev: f29b56b9c140a03edeba69ffc2dc9888b2fde106) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r--meta/recipes-graphics/wayland/libinput/determinism.patch21
-rw-r--r--meta/recipes-graphics/wayland/libinput_1.14.1.bb4
2 files changed, 24 insertions, 1 deletions
diff --git a/meta/recipes-graphics/wayland/libinput/determinism.patch b/meta/recipes-graphics/wayland/libinput/determinism.patch
new file mode 100644
index 0000000000..cb554030cf
--- /dev/null
+++ b/meta/recipes-graphics/wayland/libinput/determinism.patch
@@ -0,0 +1,21 @@
1This finds our outer git tree and that version information breaks
2determinism of this recipe. Disable it.
3
4RP 2020/2/6
5
6Upstream-Status: Pending
7Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8
9Index: libinput-1.14.3/meson.build
10===================================================================
11--- libinput-1.14.3.orig/meson.build
12+++ libinput-1.14.3/meson.build
13@@ -387,7 +387,7 @@ pkgconfig.generate(
14 libraries : lib_libinput
15 )
16
17-git_version_h = vcs_tag(command : ['git', 'describe'],
18+git_version_h = vcs_tag(command : ['false'],
19 fallback : 'unknown',
20 input : 'src/libinput-git-version.h.in',
21 output :'libinput-git-version.h')
diff --git a/meta/recipes-graphics/wayland/libinput_1.14.1.bb b/meta/recipes-graphics/wayland/libinput_1.14.1.bb
index 38bc8d2c33..2c5733f33a 100644
--- a/meta/recipes-graphics/wayland/libinput_1.14.1.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.14.1.bb
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1f2ea9ebff3a2c6d458faf58492efb63"
7 7
8DEPENDS = "libevdev udev mtdev" 8DEPENDS = "libevdev udev mtdev"
9 9
10SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" 10SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \
11 file://determinism.patch \
12"
11SRC_URI[md5sum] = "da29a704dc6f7ea2d5aac754db046340" 13SRC_URI[md5sum] = "da29a704dc6f7ea2d5aac754db046340"
12SRC_URI[sha256sum] = "e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70" 14SRC_URI[sha256sum] = "e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70"
13 15