| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | The order of dict values is not deterministic leading to differing header file generation. |
| 2 | Sort to remove this inconsistency. |
| 3 | |
| 4 | RP 2020/2/7 |
| 5 | |
| 6 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 7 | Upstream-Status: Pending |
| 8 | |
| 9 | Index: a/libevdev/make-event-names.py |
| 10 | =================================================================== |
| 11 | --- a/libevdev/make-event-names.py |
| 12 | +++ b/libevdev/make-event-names.py |
| 13 | @@ -67,10 +67,10 @@ def print_bits(bits, prefix): |
| 14 | if not hasattr(bits, prefix): |
| 15 | return |
| 16 | print("static const char * const %s_map[%s_MAX + 1] = {" % (prefix, prefix.upper())) |
| 17 | - for val, name in list(getattr(bits, prefix).items()): |
| 18 | + for val, name in sorted(list(getattr(bits, prefix).items())): |
| 19 | print(" [%s] = \"%s\"," % (name, name)) |
| 20 | if prefix == "key": |
| 21 | - for val, name in list(getattr(bits, "btn").items()): |
| 22 | + for val, name in sorted(list(getattr(bits, "btn").items())): |
| 23 | print(" [%s] = \"%s\"," % (name, name)) |
| 24 | print("};") |
| 25 | print("") |
| 26 | @@ -111,7 +111,7 @@ def print_lookup(bits, prefix): |
| 27 | if not hasattr(bits, prefix): |
| 28 | return |
| 29 | |
| 30 | - names = list(getattr(bits, prefix).items()) |
| 31 | + names = sorted(list(getattr(bits, prefix).items())) |
| 32 | if prefix == "btn": |
| 33 | names = names + btn_additional; |
| 34 | |