mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-06-11 18:38:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

debian/patches/udev-rules-creation-add-Debian-specifics.patch: refreshed

Browse Source
This commit is contained in:
Laurent Bigonville
2020-01-10 20:33:45 +01:00
parent 50e8754206
commit 1751baec91
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/changelog
Vendored
+1
View File
@@ -5,6 +5,7 @@ libfprint (1:1.90.0-1) UNRELEASED; urgency=medium
Build-Depends-Indep Build-Depends-Indep
- Drop d/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch and - Drop d/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch and
d/patches/use-non-versionned-libusbh-path.patch, not needed anymore d/patches/use-non-versionned-libusbh-path.patch, not needed anymore
- debian/patches/udev-rules-creation-add-Debian-specifics.patch: refreshed
-- Laurent Bigonville <bigon@debian.org> Fri, 10 Jan 2020 02:26:09 +0100 -- Laurent Bigonville <bigon@debian.org> Fri, 10 Jan 2020 02:26:09 +0100
debian/patches/udev-rules-creation-add-Debian-specifics.patch
Vendored
+21 -20
View File
@@ -3,29 +3,30 @@ Description: Tweak the udev rules creator for Debian usage
ones; mode and group to all. ones; mode and group to all.
Author: Didier Raboud <odyx@debian.org> Author: Didier Raboud <odyx@debian.org>
Origin: vendor Origin: vendor
Last-Update: 2015-03-03 Last-Update: 2020-01-10
--- a/libfprint/fprint-list-udev-rules.c --- a/libfprint/fprint-list-udev-rules.c
+++ b/libfprint/fprint-list-udev-rules.c +++ b/libfprint/fprint-list-udev-rules.c
@@ -63,9 +63,6 @@ static void print_driver (struct fp_driv @@ -66,9 +66,6 @@ print_driver (const FpDeviceClass *cls)
break; if (entry->vid == bl_entry->vid && entry->pid == bl_entry->pid)
} break;
}
- if (blacklist) - if (bl_entry->vid != 0)
- continue; - continue;
- -
key = g_strdup_printf ("%04x:%04x", driver->id_table[i].vendor, driver->id_table[i].product); key = g_strdup_printf ("%04x:%04x", entry->vid, entry->pid);
if (g_hash_table_lookup (printed, key) != NULL) { if (g_hash_table_lookup (printed, key) != NULL)
@@ -78,7 +75,10 @@ static void print_driver (struct fp_driv @@ -82,8 +79,10 @@ print_driver (const FpDeviceClass *cls)
if (num_printed == 0) if (num_printed == 0)
printf ("# %s\n", driver->full_name); g_print ("# %s\n", cls->full_name);
- printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\"\n", driver->id_table[i].vendor, driver->id_table[i].product); - g_print ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", TEST==\"power/control\", ATTR{power/control}=\"auto\"\n",
+ printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ", driver->id_table[i].vendor, driver->id_table[i].product); - entry->vid, entry->pid);
+ if (!blacklist) + g_print ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ATTRS{dev}==\"*\", ", entry->vid, entry->pid);
+ printf ("TEST==\"power/control\", ATTR{power/control}=\"auto\", "); + if (bl_entry->vid == 0)
+ printf ("MODE=\"0664\", GROUP=\"plugdev\"\n"); + g_print ("TEST==\"power/control\", ATTR{power/control}=\"auto\", ");
printf ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{LIBFPRINT_DRIVER}=\"%s\"\n", driver->id_table[i].vendor, driver->id_table[i].product, driver->full_name); + g_print ("MODE=\"0664\", GROUP=\"plugdev\"\n");
num_printed++; g_print ("SUBSYSTEM==\"usb\", ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ENV{LIBFPRINT_DRIVER}=\"%s\"\n",
} entry->vid, entry->pid, cls->full_name);
num_printed++;