udev: keymap - move data files to root directory

This commit is contained in:
Kay Sievers 2012-04-13 15:38:15 +02:00
parent b49d9b50cf
commit 56d35ff9ca
60 changed files with 61 additions and 61 deletions

View File

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

View File

@ -5,7 +5,7 @@
# Makefile.am # Makefile.am
SRCDIR=${1:-.} SRCDIR=${1:-.}
KEYLIST=${2:-src/udev/keymap/keys.txt} 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 RULES=$SRCDIR/src/udev/keymap/95-keymap.rules
[ -e "$KEYLIST" ] || { [ -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) \ missing=$(join -v 2 <(awk '{print tolower(substr($1,5))}' $KEYLIST | sort -u) \
<(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u)) <(grep -hv '^#' ${KEYMAPS_DIR}/*| awk '{print $2}' | sort -u))
[ -z "$missing" ] || { [ -z "$missing" ] || {
echo "ERROR: unknown key names in src/udev/keymap/keymaps/*:" >&2 echo "ERROR: unknown key names in keymaps/*:" >&2
echo "$missing" >&2 echo "$missing" >&2
exit 1 exit 1
} }
@ -31,7 +31,7 @@ for m in $maps; do
echo "ERROR: unknown map name in $RULES: $m" >&2 echo "ERROR: unknown map name in $RULES: $m" >&2
exit 1 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 echo "ERROR: map file $m is not added to Makefile.am" >&2
exit 1 exit 1
} }