From 04897fb0c6f55320050c08d7ca3c759340f6ec036d3436de5f140c0c4f55c616 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 26 May 2014 16:34:59 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=643 --- ...eyboard-also-hook-into-change-events.patch | 27 +++++++++++++++++++ systemd-mini.changes | 6 +++++ systemd-mini.spec | 3 +++ systemd.changes | 6 +++++ systemd.spec | 3 +++ 5 files changed, 45 insertions(+) create mode 100644 1020-udev-keyboard-also-hook-into-change-events.patch diff --git a/1020-udev-keyboard-also-hook-into-change-events.patch b/1020-udev-keyboard-also-hook-into-change-events.patch new file mode 100644 index 00000000..0d285973 --- /dev/null +++ b/1020-udev-keyboard-also-hook-into-change-events.patch @@ -0,0 +1,27 @@ +From 49804365ea1242456c9763058a59cf68479e07ea Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Mon, 26 May 2014 09:30:21 +0800 +Subject: [PATCH] udev: keyboard - also hook into "change" events + +Re-apply the keymaps when "udevadm trigger" is called. Hooking into +"add" only would just remove all keymap content from the udev database +instead of applying the new config. +--- + rules/60-keyboard.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git rules/60-keyboard.rules rules/60-keyboard.rules +index 4e0f366..22f71e7 100644 +--- rules/60-keyboard.rules ++++ rules/60-keyboard.rules +@@ -1,6 +1,6 @@ + # do not edit this file, it will be overwritten on update + +-ACTION!="add", GOTO="keyboard_end" ++ACTION=="remove", GOTO="keyboard_end" + KERNEL!="event*", GOTO="keyboard_end" + ENV{ID_INPUT_KEY}=="", GOTO="keyboard_end" + +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index fd15e75d..b63fb35e 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 26 16:34:10 UTC 2014 - werner@suse.de + +- Add upstream patch + 1020-udev-keyboard-also-hook-into-change-events.patch + ------------------------------------------------------------------- Mon May 26 15:25:28 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index e793e8ba..59fd1fb2 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -552,6 +552,8 @@ Patch1017: 1017-udev-serialize-synchronize-block-device-event-handli.patch Patch1018: 1018-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch # PATCH-FIX-UPSTREAM added at 2014/05/20 Patch1019: 1019-udev-avoid-use-of-uninitialized-err.patch +# PATCHFIX-UPSTREAM added at 2014/05/26 +Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -980,6 +982,7 @@ cp %{SOURCE7} m4/ %patch1017 -p0 %patch1018 -p0 %patch1019 -p0 +%patch1020 -p0 # ensure generate files are removed rm -f units/emergency.service diff --git a/systemd.changes b/systemd.changes index fd15e75d..b63fb35e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 26 16:34:10 UTC 2014 - werner@suse.de + +- Add upstream patch + 1020-udev-keyboard-also-hook-into-change-events.patch + ------------------------------------------------------------------- Mon May 26 15:25:28 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index ae98a8a6..32ab6eca 100644 --- a/systemd.spec +++ b/systemd.spec @@ -547,6 +547,8 @@ Patch1017: 1017-udev-serialize-synchronize-block-device-event-handli.patch Patch1018: 1018-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch # PATCH-FIX-UPSTREAM added at 2014/05/20 Patch1019: 1019-udev-avoid-use-of-uninitialized-err.patch +# PATCHFIX-UPSTREAM added at 2014/05/26 +Patch1020: 1020-udev-keyboard-also-hook-into-change-events.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -975,6 +977,7 @@ cp %{SOURCE7} m4/ %patch1017 -p0 %patch1018 -p0 %patch1019 -p0 +%patch1020 -p0 # ensure generate files are removed rm -f units/emergency.service