rpm/kbd
SHA256
1
0
Fork 0
forked from pool/kbd
Code Pull Requests Activity

Accepting request 835310 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/835310
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=98
This commit is contained in:
Dominique Leuenberger 2020-09-21 15:05:53 +00:00 committed by Git OBS Bridge
commit 06fa864359
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kbd-1.15.5-loadkeys-search-path.patch
View File

@ -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 "/" KEYMAPDIR "/**", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", KERNDIR "/", 0 };
+static const char *const dirpath1[] = { "", DATADIR "/" XKBKEYMAPDIR "/", DATADIR "/" LEGACYKEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
static void __attribute__((noreturn))

11
kbd.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Thu Sep 17 22:43:16 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
- Make kbdsettings working in both bash and dash (boo#1175040).
-------------------------------------------------------------------
Thu Sep 17 14:47:04 UTC 2020 - Stanislav Brabec <sbrabec@suse.com>
- 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 <jslaby@suse.com>

11
kbdsettings
View File

@ -7,11 +7,12 @@
for i in NUM SCR CAPS; do
conf=$(eval echo KBD_${i}LOCK)
[ -z ${!conf} ] && continue
param=$(echo ${i,,} | sed 's/scr/scroll/')
eval confval=\"\$$conf\"
[ -z "$confval" ] && continue
param=$(echo $i | tr A-Z a-z | sed 's/scr/scroll/')
for tty in ${KBD_TTY:-tty1 tty2 tty3 tty4 tty5 tty6}; do
case "${!conf}" in
case "$confval" in
yes)
if [ $param = "num" ]; then
touch /run/numlock-on
@ -35,11 +36,11 @@ for i in NUM SCR CAPS; do
/usr/bin/setleds -D -$param < /dev/$tty
fi
else
echo "Value ${!conf} invalid for $conf"
echo "Value $confval invalid for $conf"
fi
;;
*)
echo "error: unknown value ${!conf} in $conf"
echo "error: unknown value $confval in $conf"
;;
esac
done