summaryrefslogtreecommitdiff
path: root/hwdb/ids-update.pl
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-03-23 16:27:28 +0100
committerKay Sievers <kay@vrfy.org>2013-03-23 16:38:21 +0100
commit1d09582ab9d8bc619de3a01f01d614eab44d31c0 (patch)
treeac08583c7195fc3da3fe73480c93aebf5fd6235d /hwdb/ids-update.pl
parentbb06e0f85cf337dfaea92dc1c24d7c84249b1433 (diff)
downloadsystemd-1d09582ab9d8bc619de3a01f01d614eab44d31c0.tar.gz
hwdb: ID_PRODUCT_FROM_DATABASE --> ID_MODEL_FROM_DATABASE
With the conversion from pci-db + usb-db to hwdb, the property got accitentially renamed. Move the name back to the long established identifier *MODEL* instead of *PRODUCT*. $ git grep -l ID_MODEL_FROM_DATABASE hwdb/20-pci-vendor-model.hwdb hwdb/20-usb-vendor-model.hwdb hwdb/ids-update.pl man/systemd.device.xml rules/78-sound-card.rules src/core/device.c src/cryptsetup/cryptsetup.c
Diffstat (limited to 'hwdb/ids-update.pl')
-rwxr-xr-xhwdb/ids-update.pl14
1 files changed, 7 insertions, 7 deletions
diff --git a/hwdb/ids-update.pl b/hwdb/ids-update.pl
index 5782bb51ef..37d3556382 100755
--- a/hwdb/ids-update.pl
+++ b/hwdb/ids-update.pl
@@ -7,7 +7,7 @@ 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 from: http://www.linux-usb.org/usb.ids\n");
@@ -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");
}
}
@@ -109,7 +109,7 @@ 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 from: http://pci-ids.ucw.cz/v2.2/pci.ids\n");
@@ -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");
}
}