diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2024-09-09 17:52:38 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2024-09-10 02:38:15 +0200 |
| commit | 1055d215f5fffc9d3e47b96fe8f0dde9cd758b8e (patch) | |
| tree | eac99a942f82775bd4e06294c113142ae1bc2325 /ubuntu/_base | |
| parent | 0c7629b90478e83139b2f9670ff5f71a2dbd9d2b (diff) | |
| download | tde-packaging-1055d215f5fffc9d3e47b96fe8f0dde9cd758b8e.tar.gz tde-packaging-1055d215f5fffc9d3e47b96fe8f0dde9cd758b8e.zip | |
DEB tdebase - kcontrol: Fix the path for generating the udev rules for the Logitech mouses.
Generation of udev rules updated for currently used attribute names.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7de10e665098edea05596b9065eb966c0f77506e)
Diffstat (limited to 'ubuntu/_base')
| -rwxr-xr-x | ubuntu/_base/core/tdebase/debian/rules | 4 | ||||
| -rw-r--r-- | ubuntu/_base/core/tdebase/debian/usermap.pl | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index d24d632f0..4a5dcee66 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -116,9 +116,9 @@ binary-install/tdm-trinity:: install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf binary-install/kcontrol-trinity:: - mkdir -p debian/kcontrol/etc/udev/rules.d + mkdir -p debian/$(cdbs_curpkg)/etc/udev/rules.d chmod +x debian/usermap.pl - debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules + debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/$(cdbs_curpkg)/etc/udev/logitechmouse.rules install/klipper-trinity:: sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc diff --git a/ubuntu/_base/core/tdebase/debian/usermap.pl b/ubuntu/_base/core/tdebase/debian/usermap.pl index 9c8c61f26..bd87e2d72 100644 --- a/ubuntu/_base/core/tdebase/debian/usermap.pl +++ b/ubuntu/_base/core/tdebase/debian/usermap.pl @@ -34,7 +34,7 @@ sub parse_usermap_line { my @rule; while (my ($key, $flag) = each(%flags)) { - hex($match{match_flags}) & $flag and push @rule, qq(SYSFS{$key}=="$match{$key}",); + hex($match{match_flags}) & $flag and push @rule, qq(ATTRS{$key}=="$match{$key}",); } push @rule, ( @@ -47,9 +47,9 @@ sub parse_usermap_line { print join(' ', @rule) . "\n"; } -print "BUS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n"; +print "DRIVERS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n"; print "ACTION!=\"add\"\, GOTO=\"kcontrol_rules_end\"\n"; -print "SUBSYSTEM!=\"usb_device\"\, GOTO=\"kcontrol_rules_end\"\n\n"; +print "SUBSYSTEMS!=\"usb\"\, GOTO=\"kcontrol_rules_end\"\n\n"; foreach my $usermap (@ARGV) { open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap"; |