build-sys: add a makefile target to run all tests through valgrind

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

diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 9ab754c642e9e6540adcdcac1bbc15b23f4bbd2c..37d3556382f4b4e1e1c543e23af339520413dfa3 100755 (executable)
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -7,10 +7,10 @@ sub usb_vendor {
         my $vendor;
 
         open(IN, "<", "usb.ids");
-        open(OUT, ">", "20-usb-vendor-product.hwdb");
+        open(OUT, ">", "20-usb-vendor-model.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://www.linux-usb.org/usb.ids\n");
+                  "# Data imported from: http://www.linux-usb.org/usb.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -26,11 +26,11 @@ sub usb_vendor {
 
                 $line =~ m/^\t([0-9a-f]{4})\s*(.+)$/;
                 if (defined $1) {
-                        my $product = uc $1;
+                        my $model = uc $1;
                         my $text = $2;
                         print(OUT "\n");
-                        print(OUT "usb:v" . $vendor . "p" . $product . "*\n");
-                        print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
+                        print(OUT "usb:v" . $vendor . "p" . $model . "*\n");
+                        print(OUT " ID_MODEL_FROM_DATABASE=" . $text . "\n");
                 }
         }
 
@@ -47,7 +47,7 @@ sub usb_classes {
         open(OUT, ">", "20-usb-classes.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://www.linux-usb.org/usb.ids\n");
+                  "# Data imported from: http://www.linux-usb.org/usb.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -109,10 +109,10 @@ sub pci_vendor {
         my $device;
 
         open(IN, "<", "pci.ids");
-        open(OUT, ">", "20-pci-vendor-product.hwdb");
+        open(OUT, ">", "20-pci-vendor-model.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
+                  "# Data imported from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -133,7 +133,7 @@ sub pci_vendor {
                         my $text = $2;
                         print(OUT "\n");
                         print(OUT "pci:v0000" . $vendor . "d0000" . $device . "*\n");
-                        print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
+                        print(OUT " ID_MODEL_FROM_DATABASE=" . $text . "\n");
                         next;
                 }
 
@@ -144,7 +144,7 @@ sub pci_vendor {
                         my $text = $3;
                         print(OUT "\n");
                         print(OUT "pci:v0000" . $vendor . "d0000" . $device . "sv0000" . $sub_vendor . "sd0000" . $sub_device . "*\n");
-                        print(OUT " ID_PRODUCT_FROM_DATABASE=" . $text . "\n");
+                        print(OUT " ID_MODEL_FROM_DATABASE=" . $text . "\n");
                 }
         }
 
@@ -161,7 +161,7 @@ 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://pci-ids.ucw.cz/v2.2/pci.ids\n");
+                  "# Data imported from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
 
         while (my $line = <IN>) {
                 $line =~ s/\s+$//;
@@ -213,11 +213,13 @@ sub oui {
         open(OUT, ">", "20-OUI.hwdb");
         print(OUT "# This file is part of systemd.\n" .
                   "#\n" .
-                  "# Data imported and updated from: http://standards.ieee.org/develop/regauth/iab/iab.txt\n" .
-                  "# Data imported and updated from: http://standards.ieee.org/develop/regauth/oui/oui.txt\n");
+                  "# Data imported from:\n" .
+                  "#   http://standards.ieee.org/develop/regauth/oui/oui.txt\n" .
+                  "#   http://standards.ieee.org/develop/regauth/iab/iab.txt\n");
 
         open(IN, "<", "iab.txt");
         while (my $line = <IN>) {
+                $line =~ s/^ +//;
                 $line =~ s/\s+$//;
                 $line =~ m/^([0-9A-F]{2})-([0-9A-F]{2})-([0-9A-F]{2})\s*\(hex\)\s*.+$/;
                 if (defined $1) {
@@ -240,6 +242,7 @@ sub oui {
 
         open(IN, "<", "oui.txt");
         while (my $line = <IN>) {
+                $line =~ s/^ +//;
                 $line =~ s/\s+$//;
                 $line =~ m/^([0-9A-F]{6})\s*\(base 16\)\s*(.+)$/;
                 if (defined $1) {