chiark / gitweb /
udev: keymap - move data files to root directory
authorKay Sievers <kay@vrfy.org>
Fri, 13 Apr 2012 13:38:15 +0000 (15:38 +0200)
committerKay Sievers <kay@vrfy.org>
Fri, 13 Apr 2012 13:38:15 +0000 (15:38 +0200)
60 files changed:
Makefile.am
keymaps/acer [moved from src/udev/keymap/keymaps/acer with 100% similarity]
keymaps/acer-aspire_5720 [moved from src/udev/keymap/keymaps/acer-aspire_5720 with 100% similarity]
keymaps/acer-aspire_5920g [moved from src/udev/keymap/keymaps/acer-aspire_5920g with 100% similarity]
keymaps/acer-aspire_6920 [moved from src/udev/keymap/keymaps/acer-aspire_6920 with 100% similarity]
keymaps/acer-aspire_8930 [moved from src/udev/keymap/keymaps/acer-aspire_8930 with 100% similarity]
keymaps/acer-travelmate_c300 [moved from src/udev/keymap/keymaps/acer-travelmate_c300 with 100% similarity]
keymaps/asus [moved from src/udev/keymap/keymaps/asus with 100% similarity]
keymaps/compaq-e_evo [moved from src/udev/keymap/keymaps/compaq-e_evo with 100% similarity]
keymaps/dell [moved from src/udev/keymap/keymaps/dell with 100% similarity]
keymaps/dell-latitude-xt2 [moved from src/udev/keymap/keymaps/dell-latitude-xt2 with 100% similarity]
keymaps/everex-xt5000 [moved from src/udev/keymap/keymaps/everex-xt5000 with 100% similarity]
keymaps/fujitsu-amilo_li_2732 [moved from src/udev/keymap/keymaps/fujitsu-amilo_li_2732 with 100% similarity]
keymaps/fujitsu-amilo_pa_2548 [moved from src/udev/keymap/keymaps/fujitsu-amilo_pa_2548 with 100% similarity]
keymaps/fujitsu-amilo_pro_edition_v3505 [moved from src/udev/keymap/keymaps/fujitsu-amilo_pro_edition_v3505 with 100% similarity]
keymaps/fujitsu-amilo_pro_v3205 [moved from src/udev/keymap/keymaps/fujitsu-amilo_pro_v3205 with 100% similarity]
keymaps/fujitsu-amilo_si_1520 [moved from src/udev/keymap/keymaps/fujitsu-amilo_si_1520 with 100% similarity]
keymaps/fujitsu-esprimo_mobile_v5 [moved from src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v5 with 100% similarity]
keymaps/fujitsu-esprimo_mobile_v6 [moved from src/udev/keymap/keymaps/fujitsu-esprimo_mobile_v6 with 100% similarity]
keymaps/genius-slimstar-320 [moved from src/udev/keymap/keymaps/genius-slimstar-320 with 100% similarity]
keymaps/hewlett-packard [moved from src/udev/keymap/keymaps/hewlett-packard with 100% similarity]
keymaps/hewlett-packard-2510p_2530p [moved from src/udev/keymap/keymaps/hewlett-packard-2510p_2530p with 100% similarity]
keymaps/hewlett-packard-compaq_elitebook [moved from src/udev/keymap/keymaps/hewlett-packard-compaq_elitebook with 100% similarity]
keymaps/hewlett-packard-pavilion [moved from src/udev/keymap/keymaps/hewlett-packard-pavilion with 100% similarity]
keymaps/hewlett-packard-presario-2100 [moved from src/udev/keymap/keymaps/hewlett-packard-presario-2100 with 100% similarity]
keymaps/hewlett-packard-tablet [moved from src/udev/keymap/keymaps/hewlett-packard-tablet with 100% similarity]
keymaps/hewlett-packard-tx2 [moved from src/udev/keymap/keymaps/hewlett-packard-tx2 with 100% similarity]
keymaps/ibm-thinkpad-usb-keyboard-trackpoint [moved from src/udev/keymap/keymaps/ibm-thinkpad-usb-keyboard-trackpoint with 100% similarity]
keymaps/inventec-symphony_6.0_7.0 [moved from src/udev/keymap/keymaps/inventec-symphony_6.0_7.0 with 100% similarity]
keymaps/lenovo-3000 [moved from src/udev/keymap/keymaps/lenovo-3000 with 100% similarity]
keymaps/lenovo-ideapad [moved from src/udev/keymap/keymaps/lenovo-ideapad with 100% similarity]
keymaps/lenovo-thinkpad-usb-keyboard-trackpoint [moved from src/udev/keymap/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint with 100% similarity]
keymaps/lenovo-thinkpad_x200_tablet [moved from src/udev/keymap/keymaps/lenovo-thinkpad_x200_tablet with 100% similarity]
keymaps/lenovo-thinkpad_x6_tablet [moved from src/udev/keymap/keymaps/lenovo-thinkpad_x6_tablet with 100% similarity]
keymaps/lg-x110 [moved from src/udev/keymap/keymaps/lg-x110 with 100% similarity]
keymaps/logitech-wave [moved from src/udev/keymap/keymaps/logitech-wave with 100% similarity]
keymaps/logitech-wave-cordless [moved from src/udev/keymap/keymaps/logitech-wave-cordless with 100% similarity]
keymaps/logitech-wave-pro-cordless [moved from src/udev/keymap/keymaps/logitech-wave-pro-cordless with 100% similarity]
keymaps/maxdata-pro_7000 [moved from src/udev/keymap/keymaps/maxdata-pro_7000 with 100% similarity]
keymaps/medion-fid2060 [moved from src/udev/keymap/keymaps/medion-fid2060 with 100% similarity]
keymaps/medionnb-a555 [moved from src/udev/keymap/keymaps/medionnb-a555 with 100% similarity]
keymaps/micro-star [moved from src/udev/keymap/keymaps/micro-star with 100% similarity]
keymaps/module-asus-w3j [moved from src/udev/keymap/keymaps/module-asus-w3j with 100% similarity]
keymaps/module-ibm [moved from src/udev/keymap/keymaps/module-ibm with 100% similarity]
keymaps/module-lenovo [moved from src/udev/keymap/keymaps/module-lenovo with 100% similarity]
keymaps/module-sony [moved from src/udev/keymap/keymaps/module-sony with 100% similarity]
keymaps/module-sony-old [moved from src/udev/keymap/keymaps/module-sony-old with 100% similarity]
keymaps/module-sony-vgn [moved from src/udev/keymap/keymaps/module-sony-vgn with 100% similarity]
keymaps/olpc-xo [moved from src/udev/keymap/keymaps/olpc-xo with 100% similarity]
keymaps/onkyo [moved from src/udev/keymap/keymaps/onkyo with 100% similarity]
keymaps/oqo-model2 [moved from src/udev/keymap/keymaps/oqo-model2 with 100% similarity]
keymaps/samsung-90x3a [moved from src/udev/keymap/keymaps/samsung-90x3a with 100% similarity]
keymaps/samsung-other [moved from src/udev/keymap/keymaps/samsung-other with 100% similarity]
keymaps/samsung-sq1us [moved from src/udev/keymap/keymaps/samsung-sq1us with 100% similarity]
keymaps/samsung-sx20s [moved from src/udev/keymap/keymaps/samsung-sx20s with 100% similarity]
keymaps/toshiba-satellite_a100 [moved from src/udev/keymap/keymaps/toshiba-satellite_a100 with 100% similarity]
keymaps/toshiba-satellite_a110 [moved from src/udev/keymap/keymaps/toshiba-satellite_a110 with 100% similarity]
keymaps/toshiba-satellite_m30x [moved from src/udev/keymap/keymaps/toshiba-satellite_m30x with 100% similarity]
keymaps/zepto-znote [moved from src/udev/keymap/keymaps/zepto-znote with 100% similarity]
src/udev/keymap/check-keymaps.sh

index 34e3982..d13963f 100644 (file)
@@ -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 = \
similarity index 100%
rename from src/udev/keymap/keymaps/acer
rename to keymaps/acer
similarity index 100%
rename from src/udev/keymap/keymaps/asus
rename to keymaps/asus
similarity index 100%
rename from src/udev/keymap/keymaps/dell
rename to keymaps/dell
similarity index 100%
rename from src/udev/keymap/keymaps/onkyo
rename to keymaps/onkyo
index 765e582..c457274 100755 (executable)
@@ -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
         }