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-08 13:19:55 +0000 |
| commit | c3f6a6113f562ecdb13386c3ff52adb7973980a4 (patch) | |
| tree | 20ceda6e7dbca82e70fd4f7cf4d98c3e8f61c228 /meta/recipes-graphics | |
| parent | 8b00ec484fb851c301f13145e17707c0167feab1 (diff) | |
| download | openembedded-core-contrib-c3f6a6113f562ecdb13386c3ff52adb7973980a4.tar.gz | |
libinput: Fix determinism issue
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>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/wayland/libinput/determinism.patch | 21 | ||||
| -rw-r--r-- | meta/recipes-graphics/wayland/libinput_1.14.3.bb | 1 |
2 files changed, 22 insertions, 0 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.3.bb b/meta/recipes-graphics/wayland/libinput_1.14.3.bb index 46d46c54ee..bc5a76dc9a 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" |