From: Peter Hutterer Date: Wed, 13 Apr 2016 01:15:56 +0000 (+1000) Subject: udev: update the hwdb matches to avoid use of ( and ) X-Git-Tag: 1.2.4~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d79cf657209ad359d22e2b2c255b3de5d2c39eb;p=platform%2Fupstream%2Flibinput.git udev: update the hwdb matches to avoid use of ( and ) libudev's util_replace_chars() replaces the () with underscores so that match would work too but let's use ? instead to make it look like a regex. This now activates the rules for all cyapa touchpads, before they wouldn't have applied to any device. https://bugs.freedesktop.org/show_bug.cgi?id=93846#c12 Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede (cherry picked from commit 8ebe33827e52816bdb1da4873c98168a8fcc2ae4) --- diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb index d5978f77..242c444a 100644 --- a/udev/90-libinput-model-quirks.hwdb +++ b/udev/90-libinput-model-quirks.hwdb @@ -62,22 +62,22 @@ libinput:name:*ETPS/2 Elantech Touchpad*:dmi:* # The various chromebooks, info from modinfo chromeos_laptop, touchpad names # extrapolated from the chromiumos touchad-tests repo # https://chromium.googlesource.com/chromiumos/platform/touchpad-tests -libinput:name:Cypress APA Trackpad (cyapa):dmi:*pnFalco:pvr* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*pnFalco:pvr* libinput:name:SynPS/2 Synaptics TouchPad:dmi:*pn*Mario* -libinput:name:Cypress APA Trackpad (cyapa):dmi:*pn*Butterfly* -libinput:name:Cypress APA Trackpad (cyapa):dmi:*pn*Peppy* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*pn*Butterfly* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*pn*Peppy* libinput:name:SynPS/2 Synaptics TouchPad:dmi:*pn*ZGB* -libinput:name:Cypress APA Trackpad (cyapa):dmi:*pn*Parrot* -libinput:name:Cypress APA Trackpad (cyapa):dmi:*bvn*coreboot*:pn*Leon* -libinput:name:Cypress APA Trackpad (cyapa):dmi:*bvn*coreboot*:pn*Falco* -libinput:name:Cypress APA Trackpad (cyapa):dmi:*bvn*coreboot*:pn*Wolf* -libinput:name:Cypress APA Trackpad (cyapa):dmi:*svn*GOOGLE*:pn*Link* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*pn*Parrot* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*bvn*coreboot*:pn*Leon* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*bvn*coreboot*:pn*Falco* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*bvn*coreboot*:pn*Wolf* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*svn*GOOGLE*:pn*Link* libinput:name:SynPS/2 Synaptics TouchPad:dmi:*pn*Alex* -libinput:name:Cypress APA Trackpad (cyapa):dmi:*svn*SAMSUNG*:pn*Lumpy* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:*svn*SAMSUNG*:pn*Lumpy* libinput:name:Atmel maXTouch Touchpad:dmi:*svn*GOOGLE*:pn*Samus* LIBINPUT_MODEL_CHROMEBOOK=1 -libinput:name:Cypress APA Trackpad (cyapa):dmi:* +libinput:name:Cypress APA Trackpad ?cyapa?:dmi:* LIBINPUT_MODEL_CYAPA=1 ##########################################