build-sys: make loadable module support optional

[elogind.git] / hwdb / ids-update.pl

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 96db87d788c8c54f0e364a8482acead8953f7cc9..90b90c5de22ba21418986f49d3a68078f6f61195 100755 (executable)
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -14,7 +14,7 @@ sub usb_vendor {
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
-                $line =~ m/^([0-9a-f]{4})\s*(.*)$/;
+                $line =~ m/^([0-9a-f]{4})\s*(.+)$/;
                 if (defined $1) {
                         $vendor = uc $1;
                         my $text = $2;
@@ -24,7 +24,7 @@ sub usb_vendor {
                         next;
                 }
 
-                $line =~ m/^\t([0-9a-f]{4})\s*(.*)$/;
+                $line =~ m/^\t([0-9a-f]{4})\s*(.+)$/;
                 if (defined $1) {
                         my $product = uc $1;
                         my $text = $2;
@@ -52,13 +52,13 @@ sub usb_classes {
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
 
-                $line =~ m/^C\ ([0-9a-f]{2})\s*(.*)$/;
+                $line =~ m/^C\ ([0-9a-f]{2})\s*(.+)$/;
                 if (defined $1) {
                         $class = uc $1;
-                        my $text = $2;
-                        if ($text =~ m/^(\?|None|Unused)$/) {
+                        if ($class =~ m/^00$/) {
                                 next;
                         }
+                        my $text = $2;
                         print(OUT "\n");
                         print(OUT "usb:v*p*d*dc" . $class . "*\n");
                         print(OUT " ID_USB_CLASS_FROM_DATABASE=" . $text . "\n");
@@ -71,9 +71,12 @@ sub usb_classes {
                         last;
                 }
 
-                $line =~ m/^\t([0-9a-f]{2})\s*(.*)$/;
+                $line =~ m/^\t([0-9a-f]{2})\s*(.+)$/;
                 if (defined $1) {
                         $subclass = uc $1;
+                        if ($subclass =~ m/^00$/) {
+                                next;
+                        }
                         my $text = $2;
                         if ($text =~ m/^(\?|None|Unused)$/) {
                                 next;
@@ -84,7 +87,7 @@ sub usb_classes {
                         next;
                 }
 
-                $line =~ m/^\t\t([0-9a-f]{2})\s*(.*)$/;
+                $line =~ m/^\t\t([0-9a-f]{2})\s*(.+)$/;
                 if (defined $1) {
                         $protocol = uc $1;
                         my $text = $2;
@@ -110,11 +113,11 @@ sub pci_vendor {
         open(OUT, ">", "20-pci-vendor-product.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://pciids.sourceforge.net/v2.2/pci.ids\n");
+                  "# Data imported and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
-                $line =~ m/^([0-9a-f]{4})\s*(.*)$/;
+                $line =~ m/^([0-9a-f]{4})\s*(.+)$/;
 
                 if (defined $1) {
                         $vendor = uc $1;
@@ -125,7 +128,7 @@ sub pci_vendor {
                         next;
                 }
 
-                $line =~ m/^\t([0-9a-f]{4})\s*(.*)$/;
+                $line =~ m/^\t([0-9a-f]{4})\s*(.+)$/;
                 if (defined $1) {
                         $device = uc $1;
                         my $text = $2;
@@ -159,12 +162,12 @@ sub pci_classes {
         open(OUT, ">", "20-pci-classes.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://pciids.sourceforge.net/v2.2/pci.ids\n");
+                  "# Data imported and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
 
-                $line =~ m/^C\ ([0-9a-f]{2})\s*(.*)$/;
+                $line =~ m/^C\ ([0-9a-f]{2})\s*(.+)$/;
                 if (defined $1) {
                         $class = uc $1;
                         my $text = $2;
@@ -180,7 +183,7 @@ sub pci_classes {
                         last;
                 }
 
-                $line =~ m/^\t([0-9a-f]{2})\s*(.*)$/;
+                $line =~ m/^\t([0-9a-f]{2})\s*(.+)$/;
                 if (defined $1) {
                         $subclass = uc $1;
                         my $text = $2;
@@ -190,7 +193,7 @@ sub pci_classes {
                         next;
                 }
 
-                $line =~ m/^\t\t([0-9a-f]{2})\s*(.*)$/;
+                $line =~ m/^\t\t([0-9a-f]{2})\s*(.+)$/;
                 if (defined $1) {
                         $interface = uc $1;
                         my $text = $2;
@@ -213,7 +216,7 @@ sub oui {
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
-                $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.*)$/;
+                $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.+)$/;
                 if (defined $1) {
                         my $vendor = uc $1;
                         my $text = $2;