rules: bring some rules up to date with upstream

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>

3 files changed, 8 insertions, 14 deletions

diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
index 696b790935..4a8b8a9f6c 100644
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -3,8 +3,10 @@
 # Support for Linux 2.6.32, see https://bugs.gentoo.org/show_bug.cgi?id=457868
 SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666"
 
+# select "system RTC" or just use the first one
 SUBSYSTEM=="rtc", ATTR{hctosys}=="1", SYMLINK+="rtc"
-SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}"
+SUBSYSTEM=="rtc", KERNEL=="rtc0", SYMLINK+="rtc", OPTIONS+="link_priority=-100"
+SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644"
 
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{builtin}="hwdb --subsystem=usb"
 SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
@@ -18,8 +20,6 @@ SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620"
 SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty"
 KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout"
 
-SUBSYSTEM=="rtc", ATTR{hctosys}=="1", MODE="0644"
-
 SUBSYSTEM=="mem", KERNEL=="mem|kmem|port", GROUP="kmem", MODE="0640"
 
 SUBSYSTEM=="input", KERNEL=="mouse*|mice|event*", MODE="0640"
diff --git a/rules/95-keyboard-force-release.rules b/rules/95-keyboard-force-release.rules
index 35ecc27fb2..6c8e98d719 100644
--- a/rules/95-keyboard-force-release.rules
+++ b/rules/95-keyboard-force-release.rules
@@ -10,10 +10,6 @@
 # scancodes from the keymap file, otherwise you can run
 # ${rootlibdir}/udev/keymap -i /dev/input/eventX
 # on a Linux vt to find out.
-#
-# Note also that system-specific keymaps and rules can be added
-# into the /etc/udev/rules.d/ and /etc/udev/keymaps/ directories
-# instead of modifying or adding to the system-installed files.
 
 ACTION=="remove", GOTO="force_release_end"
 SUBSYSTEM!="serio", GOTO="force_release_end"
diff --git a/rules/95-keymap.rules b/rules/95-keymap.rules
index 2cc19d978c..bd91c58aae 100644
--- a/rules/95-keymap.rules
+++ b/rules/95-keymap.rules
@@ -4,10 +4,6 @@
 # directly as keymap arguments (if there are just one or two to change), or as
 # a file name (in ${rootlibdir}/udev/keymaps), which has to contain scancode/keyname
 # pairs.
-#
-# Note also that system-specific keymaps and rules can be added
-# into /etc/udev/keymaps/ instead of modifying or adding to the system-installed
-# files.
 
 ACTION=="remove", GOTO="keyboard_end"
 KERNEL!="event*", GOTO="keyboard_end"
@@ -107,9 +103,8 @@ ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP ProBook*", R
 ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP EliteBook 8440p", RUN+="keymap $name hewlett-packard_elitebook-8440p"
 ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HP EliteBook 8460p", RUN+="keymap $name hewlett-packard_elitebook-8460p"
 ENV{DMI_VENDOR}=="Hewlett-Packard", ATTR{[dmi/id]product_name}=="HDX9494NR", RUN+="keymap $name hewlett-packard-hdx9494nr"
-# HP Pavillion dv6315ea has empty DMI_VENDOR
-# quick play
-ATTR{[dmi/id]board_vendor}=="Quanta", ATTR{[dmi/id]board_name}=="30B7", ATTR{[dmi/id]board_version}=="65.2B", RUN+="keymap $name 0x88 media"
+# HP Pavilion dv6315ea has empty DMI_VENDOR
+ATTR{[dmi/id]board_vendor}=="Quanta", ATTR{[dmi/id]board_name}=="30B7", ATTR{[dmi/id]board_version}=="65.2B", RUN+="keymap $name 0x88 media" # "quick play
 
 # Gateway clone of Acer Aspire One AOA110/AOA150
 ENV{DMI_VENDOR}=="Gateway*", ATTR{[dmi/id]product_name}=="*AOA1*", RUN+="keymap $name acer"
@@ -151,6 +146,9 @@ ENV{DMI_VENDOR}=="MICRO-STAR*|Micro-Star*", ATTR{[dmi/id]product_name}=="GE60*|G
 # brightness; so ignore those atkbd ones, to avoid loops
 ENV{DMI_VENDOR}=="MICRO-STAR*", ATTR{[dmi/id]product_name}=="*U-100*|*U100*|*N033", RUN+="keymap $name 0xF7 reserved 0xF8 reserved"
 
+# MSI Wind U90/U100 generates separate touchpad on/off keycodes so ignore touchpad toggle keycode
+ENV{DMI_VENDOR}=="MICRO-STAR*", ATTR{[dmi/id]product_name}=="U90/U100", RUN+="keymap $name 0xE4 reserved"
+
 ENV{DMI_VENDOR}=="INVENTEC", ATTR{[dmi/id]product_name}=="SYMPHONY 6.0/7.0", RUN+="keymap $name inventec-symphony_6.0_7.0"
 
 ENV{DMI_VENDOR}=="MAXDATA", ATTR{[dmi/id]product_name}=="Pro 7000*", RUN+="keymap $name maxdata-pro_7000"