summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2012-01-24 15:12:46 +0100
committerKay Sievers <kay.sievers@vrfy.org>2012-01-24 15:12:46 +0100
commit9c4eda12605c5e562002a63e83ddf06bfbf48988 (patch)
tree1ae5614be381af0da2953d1b6973c15c0b0e270e
parente605cf7782fdf1dc2e13b95e906e731d61e6cf12 (diff)
fix path to extras
-rw-r--r--rules/misc/30-kernel-compat.rules2
-rwxr-xr-xsrc/extras/keymap/check-keymaps.sh8
2 files changed, 5 insertions, 5 deletions
diff --git a/rules/misc/30-kernel-compat.rules b/rules/misc/30-kernel-compat.rules
index 7240f9b234..cddf371d3b 100644
--- a/rules/misc/30-kernel-compat.rules
+++ b/rules/misc/30-kernel-compat.rules
@@ -7,7 +7,7 @@
ACTION!="add", GOTO="kernel_compat_end"
-# see extras/qemu/42-qemu-usb.rules, version for 2.6.32 + older.
+# see src/extras/qemu/42-qemu-usb.rules, version for 2.6.32 + older.
ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Mouse", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"
ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Tablet", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"
ACTION=="add", SUBSYSTEM=="usb", ATTR{product}=="QEMU USB Keyboard", ATTR{serial}=="42", TEST=="power/level", ATTR{power/level}="auto"
diff --git a/src/extras/keymap/check-keymaps.sh b/src/extras/keymap/check-keymaps.sh
index f81b6aac36..423699b5a8 100755
--- a/src/extras/keymap/check-keymaps.sh
+++ b/src/extras/keymap/check-keymaps.sh
@@ -1,11 +1,11 @@
-#!/usr/bin/env bash
+#!/bin/bash
# check that all key names in keymaps/* are known in <linux/input.h>
# and that all key maps listed in the rules are valid and present in
# Makefile.am
SRCDIR=${1:-.}
KEYLIST=${2:-src/extras/keymap/keys.txt}
-KEYMAPS_DIR=$SRCDIR/src/extras/keymap/keymaps #extras/keymap/keymaps
+KEYMAPS_DIR=$SRCDIR/src/extras/keymap/keymaps
RULES=$SRCDIR/src/extras/keymap/95-keymap.rules
[ -e "$KEYLIST" ] || {
@@ -16,7 +16,7 @@ RULES=$SRCDIR/src/extras/keymap/95-keymap.rules
missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
<(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u))
[ -z "$missing" ] || {
- echo "ERROR: unknown key names in extras/keymap/keymaps/*:" >&2
+ echo "ERROR: unknown key names in src/extras/keymap/keymaps/*:" >&2
echo "$missing" >&2
exit 1
}
@@ -31,7 +31,7 @@ for m in $maps; do
echo "ERROR: unknown map name in $RULES: $m" >&2
exit 1
}
- grep -q "extras/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
+ grep -q "src/extras/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
echo "ERROR: map file $m is not added to Makefile.am" >&2
exit 1
}