udev: keymap - move data files to root directory

Makefile.am

@@ -1809,64 +1809,64 @@ CLEANFILES += \
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
-	src/udev/keymap/keymaps/acer \
-	src/udev/keymap/keymaps/acer-aspire_5720 \
-	src/udev/keymap/keymaps/acer-aspire_8930 \
-	src/udev/keymap/keymaps/acer-aspire_5920g \
-	src/udev/keymap/keymaps/acer-aspire_6920 \
-	src/udev/keymap/keymaps/acer-travelmate_c300 \
-	src/udev/keymap/keymaps/asus \
-	src/udev/keymap/keymaps/compaq-e_evo \
-	src/udev/keymap/keymaps/dell \
-	src/udev/keymap/keymaps/dell-latitude-xt2 \
-	src/udev/keymap/keymaps/everex-xt5000 \
-	src/udev/keymap/keymaps/fujitsu-amilo_li_2732 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 \
-	src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 \
-	src/udev/keymap/keymaps/fujitsu-amilo_si_1520 \
-	src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 \
-	src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 \
-	src/udev/keymap/keymaps/genius-slimstar-320 \
-	src/udev/keymap/keymaps/hewlett-packard \
-	src/udev/keymap/keymaps/hewlett-packard-2510p_2530p \
-	src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook \
-	src/udev/keymap/keymaps/hewlett-packard-pavilion \
-	src/udev/keymap/keymaps/hewlett-packard-presario-2100 \
-	src/udev/keymap/keymaps/hewlett-packard-tablet \
-	src/udev/keymap/keymaps/hewlett-packard-tx2 \
-	src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
-	src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 \
-	src/udev/keymap/keymaps/lenovo-3000 \
-	src/udev/keymap/keymaps/lenovo-ideapad \
-	src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
-	src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet \
-	src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet \
-	src/udev/keymap/keymaps/lg-x110 \
-	src/udev/keymap/keymaps/logitech-wave \
-	src/udev/keymap/keymaps/logitech-wave-cordless \
-	src/udev/keymap/keymaps/logitech-wave-pro-cordless \
-	src/udev/keymap/keymaps/maxdata-pro_7000 \
-	src/udev/keymap/keymaps/medion-fid2060 \
-	src/udev/keymap/keymaps/medionnb-a555 \
-	src/udev/keymap/keymaps/micro-star \
-	src/udev/keymap/keymaps/module-asus-w3j \
-	src/udev/keymap/keymaps/module-ibm \
-	src/udev/keymap/keymaps/module-lenovo \
-	src/udev/keymap/keymaps/module-sony \
-	src/udev/keymap/keymaps/module-sony-old \
-	src/udev/keymap/keymaps/module-sony-vgn \
-	src/udev/keymap/keymaps/olpc-xo \
-	src/udev/keymap/keymaps/onkyo \
-	src/udev/keymap/keymaps/oqo-model2 \
-	src/udev/keymap/keymaps/samsung-other \
-	src/udev/keymap/keymaps/samsung-90x3a \
-	src/udev/keymap/keymaps/samsung-sq1us \
-	src/udev/keymap/keymaps/samsung-sx20s \
-	src/udev/keymap/keymaps/toshiba-satellite_a100 \
-	src/udev/keymap/keymaps/toshiba-satellite_a110 \
-	src/udev/keymap/keymaps/toshiba-satellite_m30x \
-	src/udev/keymap/keymaps/zepto-znote
+	keymaps/acer \
+	keymaps/acer-aspire_5720 \
+	keymaps/acer-aspire_8930 \
+	keymaps/acer-aspire_5920g \
+	keymaps/acer-aspire_6920 \
+	keymaps/acer-travelmate_c300 \
+	keymaps/asus \
+	keymaps/compaq-e_evo \
+	keymaps/dell \
+	keymaps/dell-latitude-xt2 \
+	keymaps/everex-xt5000 \
+	keymaps/fujitsu-amilo_li_2732 \
+	keymaps/fujitsu-amilo_pa_2548 \
+	keymaps/fujitsu-amilo_pro_edition_v3505 \
+	keymaps/fujitsu-amilo_pro_v3205 \
+	keymaps/fujitsu-amilo_si_1520 \
+	keymaps/fujitsu-esprimo_mobile_v5 \
+	keymaps/fujitsu-esprimo_mobile_v6 \
+	keymaps/genius-slimstar-320 \
+	keymaps/hewlett-packard \
+	keymaps/hewlett-packard-2510p_2530p \
+	keymaps/hewlett-packard-compaq_elitebook \
+	keymaps/hewlett-packard-pavilion \
+	keymaps/hewlett-packard-presario-2100 \
+	keymaps/hewlett-packard-tablet \
+	keymaps/hewlett-packard-tx2 \
+	keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
+	keymaps/inventec-symphony_6.0_7.0 \
+	keymaps/lenovo-3000 \
+	keymaps/lenovo-ideapad \
+	keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
+	keymaps/lenovo-thinkpad_x6_tablet \
+	keymaps/lenovo-thinkpad_x200_tablet \
+	keymaps/lg-x110 \
+	keymaps/logitech-wave \
+	keymaps/logitech-wave-cordless \
+	keymaps/logitech-wave-pro-cordless \
+	keymaps/maxdata-pro_7000 \
+	keymaps/medion-fid2060 \
+	keymaps/medionnb-a555 \
+	keymaps/micro-star \
+	keymaps/module-asus-w3j \
+	keymaps/module-ibm \
+	keymaps/module-lenovo \
+	keymaps/module-sony \
+	keymaps/module-sony-old \
+	keymaps/module-sony-vgn \
+	keymaps/olpc-xo \
+	keymaps/onkyo \
+	keymaps/oqo-model2 \
+	keymaps/samsung-other \
+	keymaps/samsung-90x3a \
+	keymaps/samsung-sq1us \
+	keymaps/samsung-sx20s \
+	keymaps/toshiba-satellite_a100 \
+	keymaps/toshiba-satellite_a110 \
+	keymaps/toshiba-satellite_m30x \
+	keymaps/zepto-znote
 
 udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \

src/udev/keymap/check-keymaps.sh

@@ -5,7 +5,7 @@
 # Makefile.am
 SRCDIR=${1:-.}
 KEYLIST=${2:-src/udev/keymap/keys.txt}
-KEYMAPS_DIR=$SRCDIR/src/udev/keymap/keymaps
+KEYMAPS_DIR=$SRCDIR/keymaps
 RULES=$SRCDIR/src/udev/keymap/95-keymap.rules
 
 [ -e "$KEYLIST" ] || {
@@ -16,7 +16,7 @@ RULES=$SRCDIR/src/udev/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 src/udev/keymap/keymaps/*:" >&2
+        echo "ERROR: unknown key names in 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 "src/udev/keymap/keymaps/$m\>" $SRCDIR/Makefile.am || {
+        grep -q "keymaps/$m\>" $SRCDIR/Makefile.am || {
                 echo "ERROR: map file $m is not added to Makefile.am" >&2
                 exit 1
         }