chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge keymap building in the top-level Makefile.am.
[elogind.git]
/
extras
/
keymap
/
check-keymaps.sh
diff --git
a/extras/keymap/check-keymaps.sh
b/extras/keymap/check-keymaps.sh
index 15e8ef8c1ebe03c62e1dd981f4d9c62a5043616b..f79c3f5a823e11214a5702cb12519085b871ae86 100755
(executable)
--- a/
extras/keymap/check-keymaps.sh
+++ b/
extras/keymap/check-keymaps.sh
@@
-1,17
+1,17
@@
#!/bin/bash
# check that all key names in keymaps/* are known in <linux/input.h>
#!/bin/bash
# check that all key names in keymaps/* are known in <linux/input.h>
-KEYLIST=
.
/keys.txt
-RULES=95-keymap.rules
+KEYLIST=
extras/keymap
/keys.txt
+RULES=
extras/keymap/
95-keymap.rules
[ -e "$KEYLIST" ] || {
echo "need $KEYLIST please build first" >&2
exit 1
}
[ -e "$KEYLIST" ] || {
echo "need $KEYLIST please build first" >&2
exit 1
}
-missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) <(awk '{print $2}' keymaps/*|sort -u))
+missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) <(awk '{print $2}'
extras/keymap/
keymaps/*|sort -u))
[ -z "$missing" ] || {
[ -z "$missing" ] || {
- echo "ERROR: unknown key names in keymaps/*:" >&2
+ echo "ERROR: unknown key names in
extras/keymap/
keymaps/*:" >&2
echo "$missing" >&2
exit 1
}
echo "$missing" >&2
exit 1
}
@@
-22,11
+22,11
@@
for m in $maps; do
# ignore inline mappings
[ "$m" = "${m#0x}" ] || continue
# ignore inline mappings
[ "$m" = "${m#0x}" ] || continue
- [ -e keymaps/$m ] || {
+ [ -e
extras/keymap/
keymaps/$m ] || {
echo "ERROR: unknown map name in $RULES: $m" >&2
exit 1
}
echo "ERROR: unknown map name in $RULES: $m" >&2
exit 1
}
- grep -q "keymaps/$m\>" Makefile.am || {
+ grep -q "
extras/keymap/
keymaps/$m\>" Makefile.am || {
echo "ERROR: map file $m is not added to Makefile.am" >&2
exit 1
}
echo "ERROR: map file $m is not added to Makefile.am" >&2
exit 1
}