blob: 71cbd876eb6b23b5fe0f7f405625a6157210c9ee [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>
Andrew Geissler90fd73c2021-03-05 15:25:55 -060012Submitted: https://lists.freedesktop.org/archives/input-tools/2021-February/001560.html
13Upstream-Status: Backport [https://gitlab.freedesktop.org/libevdev/libevdev/-/commit/8d70f449892c6f7659e07bb0f06b8347677bb7d8]
Andrew Geissler82c905d2020-04-13 13:39:40 -050014
Andrew Geissler4b740dc2020-05-05 08:54:39 -050015---
16 libevdev/make-event-names.py | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
18
19diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
20index 88addd7..c973e2a 100755
Andrew Geissler82c905d2020-04-13 13:39:40 -050021--- a/libevdev/make-event-names.py
22+++ b/libevdev/make-event-names.py
Andrew Geissler4b740dc2020-05-05 08:54:39 -050023@@ -70,10 +70,10 @@ def print_bits(bits, prefix):
24 if not hasattr(bits, prefix):
25 return
26 print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper()))
27- for val, name in list(getattr(bits, prefix).items()):
28+ for val, name in sorted(list(getattr(bits, prefix).items())):
29 print(" [%s] = \"%s\"," % (name, name))
30 if prefix == "key":
31- for val, name in list(getattr(bits, "btn").items()):
32+ for val, name in sorted(list(getattr(bits, "btn").items())):
33 print(" [%s] = \"%s\"," % (name, name))
34 print("};")
35 print("")
36@@ -118,7 +118,7 @@ def print_lookup(bits, prefix):
37 if not hasattr(bits, prefix):
38 return
Andrew Geissler82c905d2020-04-13 13:39:40 -050039
Andrew Geissler4b740dc2020-05-05 08:54:39 -050040- names = list(getattr(bits, prefix).items())
41+ names = sorted(list(getattr(bits, prefix).items()))
42 if prefix == "btn":
43 names = names + btn_additional
Andrew Geissler82c905d2020-04-13 13:39:40 -050044