blob: f6b7fc82d3d9116d63bd3e9bfe6523f355de2aea [file] [log] [blame]
Andrew Geissler4b740dc2020-05-05 08:54:39 -05001From 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
Andrew Geissler82c905d2020-04-13 13:39:40 -05006The order of dict values is not deterministic leading to differing header file generation.
7Sort to remove this inconsistency.
8
9RP 2020/2/7
10
11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12Upstream-Status: Pending
13
Andrew Geissler4b740dc2020-05-05 08:54:39 -050014---
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
Andrew Geissler82c905d2020-04-13 13:39:40 -050020--- a/libevdev/make-event-names.py
21+++ b/libevdev/make-event-names.py
Andrew Geissler4b740dc2020-05-05 08:54:39 -050022@@ -70,10 +70,10 @@ def print_bits(bits, prefix):
23 if not hasattr(bits, prefix):
24 return
25 print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper()))
26- for val, name in list(getattr(bits, prefix).items()):
27+ for val, name in sorted(list(getattr(bits, prefix).items())):
28 print(" [%s] = \"%s\"," % (name, name))
29 if prefix == "key":
30- for val, name in list(getattr(bits, "btn").items()):
31+ for val, name in sorted(list(getattr(bits, "btn").items())):
32 print(" [%s] = \"%s\"," % (name, name))
33 print("};")
34 print("")
35@@ -118,7 +118,7 @@ def print_lookup(bits, prefix):
36 if not hasattr(bits, prefix):
37 return
Andrew Geissler82c905d2020-04-13 13:39:40 -050038
Andrew Geissler4b740dc2020-05-05 08:54:39 -050039- names = list(getattr(bits, prefix).items())
40+ names = sorted(list(getattr(bits, prefix).items()))
41 if prefix == "btn":
42 names = names + btn_additional
Andrew Geissler82c905d2020-04-13 13:39:40 -050043