diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-06 23:57:28 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-11 23:04:29 +0000 |
| commit | f29b56b9c140a03edeba69ffc2dc9888b2fde106 (patch) | |
| tree | 8604b4859bbe8a76cac3cfd09b5de039c0b09b81 | |
| parent | 46f9c48dc11928ace672e9a3dea7c01d29cf3f04 (diff) | |
| download | openembedded-core-contrib-f29b56b9c140a03edeba69ffc2dc9888b2fde106.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)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-graphics/wayland/libinput/determinism.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/libinput_1.14.1.bb | 4 |
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 @@ +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.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" DEPENDS = "libevdev udev mtdev" -SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ + file://determinism.patch \ +" SRC_URI[md5sum] = "da29a704dc6f7ea2d5aac754db046340" SRC_URI[sha256sum] = "e333a3242835c019ca37d2cef8b51a87d3138eb47444119c0153dc7a8656ee70" |