From 12c7d4d65e4fbc95b2f76853bdcf4fdc554d5c11 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 19 Dec 2019 11:48:46 +0100 Subject: [PATCH] hwdb: ignore keys added in kernel 5.5 python-evdev needs to be rebuilt with new kernel headers. Before that happens, our test would reject those keys as unknown. --- hwdb.d/parse_hwdb.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hwdb.d/parse_hwdb.py b/hwdb.d/parse_hwdb.py index 9a933b82b29..b5395b11fe5 100755 --- a/hwdb.d/parse_hwdb.py +++ b/hwdb.d/parse_hwdb.py @@ -196,10 +196,11 @@ def check_one_mount_matrix(prop, value): def check_one_keycode(prop, value): if value != '!' and ecodes is not None: key = 'KEY_' + value.upper() - if key not in ecodes: - key = value.upper() - if key not in ecodes: - error('Keycode {} unknown', key) + if not (key in ecodes or + value.upper() in ecodes or + # new keys added in kernel 5.5 + 'KBD_LCD_MENU' in key): + error('Keycode {} unknown', key) def check_properties(groups): grammar = property_grammar() -- 2.47.3