summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libevdev
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libevdev')
-rw-r--r--meta/recipes-support/libevdev/libevdev/determinism.patch53
-rw-r--r--meta/recipes-support/libevdev/libevdev_1.9.0.bb (renamed from meta/recipes-support/libevdev/libevdev_1.8.0.bb)4
2 files changed, 33 insertions, 24 deletions
diff --git a/meta/recipes-support/libevdev/libevdev/determinism.patch b/meta/recipes-support/libevdev/libevdev/determinism.patch
index 33a6076b78..f6b7fc82d3 100644
--- a/meta/recipes-support/libevdev/libevdev/determinism.patch
+++ b/meta/recipes-support/libevdev/libevdev/determinism.patch
@@ -1,3 +1,8 @@
1From 4f196323aba5b0f49979826533c65633b8a9b6a2 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Fri, 7 Feb 2020 12:29:56 +0000
4Subject: [PATCH] libevdev: Fix determinism issue
5
1The order of dict values is not deterministic leading to differing header file generation. 6The order of dict values is not deterministic leading to differing header file generation.
2Sort to remove this inconsistency. 7Sort to remove this inconsistency.
3 8
@@ -6,29 +11,33 @@ RP 2020/2/7
6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> 11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7Upstream-Status: Pending 12Upstream-Status: Pending
8 13
9Index: a/libevdev/make-event-names.py 14---
10=================================================================== 15 libevdev/make-event-names.py | 6 +++---
16 1 file changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
19index 88addd7..c973e2a 100755
11--- a/libevdev/make-event-names.py 20--- a/libevdev/make-event-names.py
12+++ b/libevdev/make-event-names.py 21+++ b/libevdev/make-event-names.py
13@@ -67,10 +67,10 @@ def print_bits(bits, prefix): 22@@ -70,10 +70,10 @@ def print_bits(bits, prefix):
14 if not hasattr(bits, prefix): 23 if not hasattr(bits, prefix):
15 return 24 return
16 print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) 25 print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper()))
17- for val, name in list(getattr(bits, prefix).items()): 26- for val, name in list(getattr(bits, prefix).items()):
18+ for val, name in sorted(list(getattr(bits, prefix).items())): 27+ for val, name in sorted(list(getattr(bits, prefix).items())):
19 print(" [%s] = \"%s\"," % (name, name)) 28 print(" [%s] = \"%s\"," % (name, name))
20 if prefix == "key": 29 if prefix == "key":
21- for val, name in list(getattr(bits, "btn").items()): 30- for val, name in list(getattr(bits, "btn").items()):
22+ for val, name in sorted(list(getattr(bits, "btn").items())): 31+ for val, name in sorted(list(getattr(bits, "btn").items())):
23 print(" [%s] = \"%s\"," % (name, name)) 32 print(" [%s] = \"%s\"," % (name, name))
24 print("};") 33 print("};")
25 print("") 34 print("")
26@@ -111,7 +111,7 @@ def print_lookup(bits, prefix): 35@@ -118,7 +118,7 @@ def print_lookup(bits, prefix):
27 if not hasattr(bits, prefix): 36 if not hasattr(bits, prefix):
28 return 37 return
29 38
30- names = list(getattr(bits, prefix).items()) 39- names = list(getattr(bits, prefix).items())
31+ names = sorted(list(getattr(bits, prefix).items())) 40+ names = sorted(list(getattr(bits, prefix).items()))
32 if prefix == "btn": 41 if prefix == "btn":
33 names = names + btn_additional; 42 names = names + btn_additional
34 43
diff --git a/meta/recipes-support/libevdev/libevdev_1.8.0.bb b/meta/recipes-support/libevdev/libevdev_1.9.0.bb
index 3523dc0968..a2116a492f 100644
--- a/meta/recipes-support/libevdev/libevdev_1.8.0.bb
+++ b/meta/recipes-support/libevdev/libevdev_1.9.0.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75aae0d38feea6fda97ca381cb9132eb \
8 8
9SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \ 9SRC_URI = "http://www.freedesktop.org/software/libevdev/${BP}.tar.xz \
10 file://determinism.patch" 10 file://determinism.patch"
11SRC_URI[md5sum] = "879631080be18526737e33b63d848039" 11SRC_URI[md5sum] = "13c3f0911f9326d4b9fa103365f84421"
12SRC_URI[sha256sum] = "20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211" 12SRC_URI[sha256sum] = "e7e18a64264f2dea19b6c50a481f8c062529d42919ccda0bc861495bce28eb9e"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15