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>
pull/361/head
Slávek Banko 2 months ago
parent e3b59688e8
commit 7de10e6650
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -118,9 +118,9 @@ binary-install/tdm-trinity::
install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf
binary-install/kcontrol-trinity:: 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 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:: install/klipper-trinity::
sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc

@ -34,7 +34,7 @@ sub parse_usermap_line {
my @rule; my @rule;
while (my ($key, $flag) = each(%flags)) { 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, push @rule,
( (
@ -47,9 +47,9 @@ sub parse_usermap_line {
print join(' ', @rule) . "\n"; 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 "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) { foreach my $usermap (@ARGV) {
open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap"; open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap";

@ -135,9 +135,9 @@ binary-install/tdm-trinity::
install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf
binary-install/kcontrol-trinity:: 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 # 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:: install/klipper-trinity::
sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc

@ -34,7 +34,7 @@ sub parse_usermap_line {
my @rule; my @rule;
while (my ($key, $flag) = each(%flags)) { 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, push @rule,
( (
@ -47,9 +47,9 @@ sub parse_usermap_line {
print join(' ', @rule) . "\n"; 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 "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) { foreach my $usermap (@ARGV) {
open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap"; open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap";

@ -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 install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf
binary-install/kcontrol-trinity:: 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 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:: install/klipper-trinity::
sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc

@ -34,7 +34,7 @@ sub parse_usermap_line {
my @rule; my @rule;
while (my ($key, $flag) = each(%flags)) { 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, push @rule,
( (
@ -47,9 +47,9 @@ sub parse_usermap_line {
print join(' ', @rule) . "\n"; 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 "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) { foreach my $usermap (@ARGV) {
open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap"; open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap";

Loading…
Cancel
Save