From 24a332663b6bd3a66a8ed6d6cfb3d8f4eeeca0c252533f1859559e7f6f8422d6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 23 Sep 2020 11:01:11 +0000 Subject: [PATCH] https://bugzilla.opensuse.org/show_bug.cgi?id=1176854 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=101 --- kbd-1.15.5-loadkeys-search-path.patch | 2 +- kbd.changes | 11 ----------- kbdsettings | 11 +++++------ 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/kbd-1.15.5-loadkeys-search-path.patch b/kbd-1.15.5-loadkeys-search-path.patch index e6565a8..7bb5edf 100644 --- a/kbd-1.15.5-loadkeys-search-path.patch +++ b/kbd-1.15.5-loadkeys-search-path.patch @@ -7,7 +7,7 @@ Index: kbd-2.2.0/src/loadkeys.c #include "keymap.h" -static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; -+static const char *const dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 }; ++static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 }; static const char *const suffixes[] = { "", ".kmap", ".map", 0 }; static void __attribute__((noreturn)) diff --git a/kbd.changes b/kbd.changes index b05d70c..3fd4cf5 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec - -- Make kbdsettings working in both bash and dash (boo#1175040). - -------------------------------------------------------------------- -Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec - -- Fix kbd-1.15.5-loadkeys-search-path.patch to prefer xkb keymaps - (boo#1176302). - ------------------------------------------------------------------- Thu Aug 20 11:34:32 UTC 2020 - Jiri Slaby diff --git a/kbdsettings b/kbdsettings index 33736ac..5b944af 100644 --- a/kbdsettings +++ b/kbdsettings @@ -7,12 +7,11 @@ for i in NUM SCR CAPS; do conf=$(eval echo KBD_${i}LOCK) - eval confval=\"\$$conf\" - [ -z "$confval" ] && continue - param=$(echo $i | tr A-Z a-z | sed 's/scr/scroll/') + [ -z ${!conf} ] && continue + param=$(echo ${i,,} | sed 's/scr/scroll/') for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do - case "$confval" in + case "${!conf}" in yes) if [ $param = "num" ]; then touch /run/numlock-on @@ -36,11 +35,11 @@ for i in NUM SCR CAPS; do /usr/bin/setleds -D -$param < /dev/$tty fi else - echo "Value $confval invalid for $conf" + echo "Value ${!conf} invalid for $conf" fi ;; *) - echo "error: unknown value $confval in $conf" + echo "error: unknown value ${!conf} in $conf" ;; esac done