mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 03:32:12 +02:00
libevdev: update to 1.9.0
(From OE-Core rev: 075ce9fdbac8c58696cf5a9718446f94352b6ce8) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
db07280a75
commit
4b4816514a
@@ -1,3 +1,8 @@
|
||||
From 4f196323aba5b0f49979826533c65633b8a9b6a2 Mon Sep 17 00:00:00 2001
|
||||
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Date: Fri, 7 Feb 2020 12:29:56 +0000
|
||||
Subject: [PATCH] libevdev: Fix determinism issue
|
||||
|
||||
The order of dict values is not deterministic leading to differing header file generation.
|
||||
Sort to remove this inconsistency.
|
||||
|
||||
@@ -6,29 +11,33 @@ RP 2020/2/7
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Upstream-Status: Pending
|
||||
|
||||
Index: a/libevdev/make-event-names.py
|
||||
===================================================================
|
||||
---
|
||||
libevdev/make-event-names.py | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libevdev/make-event-names.py b/libevdev/make-event-names.py
|
||||
index 88addd7..c973e2a 100755
|
||||
--- a/libevdev/make-event-names.py
|
||||
+++ b/libevdev/make-event-names.py
|
||||
@@ -67,10 +67,10 @@ def print_bits(bits, prefix):
|
||||
if not hasattr(bits, prefix):
|
||||
return
|
||||
print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper()))
|
||||
- for val, name in list(getattr(bits, prefix).items()):
|
||||
+ for val, name in sorted(list(getattr(bits, prefix).items())):
|
||||
print(" [%s] = \"%s\"," % (name, name))
|
||||
if prefix == "key":
|
||||
- for val, name in list(getattr(bits, "btn").items()):
|
||||
+ for val, name in sorted(list(getattr(bits, "btn").items())):
|
||||
print(" [%s] = \"%s\"," % (name, name))
|
||||
print("};")
|
||||
print("")
|
||||
@@ -111,7 +111,7 @@ def print_lookup(bits, prefix):
|
||||
if not hasattr(bits, prefix):
|
||||
return
|
||||
@@ -70,10 +70,10 @@ def print_bits(bits, prefix):
|
||||
if not hasattr(bits, prefix):
|
||||
return
|
||||
print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper()))
|
||||
- for val, name in list(getattr(bits, prefix).items()):
|
||||
+ for val, name in sorted(list(getattr(bits, prefix).items())):
|
||||
print(" [%s] = \"%s\"," % (name, name))
|
||||
if prefix == "key":
|
||||
- for val, name in list(getattr(bits, "btn").items()):
|
||||
+ for val, name in sorted(list(getattr(bits, "btn").items())):
|
||||
print(" [%s] = \"%s\"," % (name, name))
|
||||
print("};")
|
||||
print("")
|
||||
@@ -118,7 +118,7 @@ def print_lookup(bits, prefix):
|
||||
if not hasattr(bits, prefix):
|
||||
return
|
||||
|
||||
- names = list(getattr(bits, prefix).items())
|
||||
+ names = sorted(list(getattr(bits, prefix).items()))
|
||||
if prefix == "btn":
|
||||
names = names + btn_additional;
|
||||
- names = list(getattr(bits, prefix).items())
|
||||
+ names = sorted(list(getattr(bits, prefix).items()))
|
||||
if prefix == "btn":
|
||||
names = names + btn_additional
|
||||
|
||||
|
||||
Reference in New Issue
Block a user