Hello community, here is the log from the commit of package pciutils-ids for openSUSE:Factory checked in at 2015-09-24 07:18:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pciutils-ids (Old) and /work/SRC/openSUSE:Factory/.pciutils-ids.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pciutils-ids" Changes: -------- --- /work/SRC/openSUSE:Factory/pciutils-ids/pciutils-ids.changes 2015-09-11 09:03:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pciutils-ids.new/pciutils-ids.changes 2015-09-24 07:18:14.000000000 +0200 @@ -1,0 +2,15 @@ +Mon Sep 21 09:50:40 CEST 2015 - jdelv...@suse.de + +- merge-pciids.pl: Incorporate everything the merge-pciids wrapper + was doing. +- merge-pciids: Obsolete, delete. + +------------------------------------------------------------------- +Thu Sep 17 12:50:19 CEST 2015 - jdelv...@suse.de + +- merge-pciids.pl: Don't warn about conflicting definitions by + default (bsc#911528, bsc#944825.) Add option -v to print such + warnings again. +- merge-pciids: Let options pass through to merge-pciids.pl. + +------------------------------------------------------------------- Old: ---- merge-pciids ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pciutils-ids.spec ++++++ --- /var/tmp/diff_new_pack.WsPvRb/_old 2015-09-24 07:18:15.000000000 +0200 +++ /var/tmp/diff_new_pack.WsPvRb/_new 2015-09-24 07:18:15.000000000 +0200 @@ -24,7 +24,6 @@ Group: Hardware/Other Url: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml Source: http://pciids.sourceforge.net/pci.ids.bz2 -Source2: merge-pciids Source4: merge-pciids.pl Requires(post): %{_bindir}/perl coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,8 +43,7 @@ install -d -m755 %{buildroot}%{_datadir}/pci.ids.d install -m644 pci.ids.dist %{buildroot}%{_datadir}/pci.ids.d/ install -d -m755 %{buildroot}%{_prefix}/bin -install -m755 %{SOURCE4} %{buildroot}%{_bindir}/ -install -m755 %{SOURCE2} %{buildroot}%{_bindir}/ +install -m755 %{SOURCE4} %{buildroot}%{_bindir}/merge-pciids install -m644 /dev/null %{buildroot}%{_datadir}/pci.ids %files @@ -53,7 +51,6 @@ %dir %{_datadir}/pci.ids.d %{_datadir}/pci.ids.d/pci.ids.dist %{_bindir}/merge-pciids -%{_bindir}/merge-pciids.pl %ghost %{_datadir}/pci.ids %post ++++++ merge-pciids.pl ++++++ --- /var/tmp/diff_new_pack.WsPvRb/_old 2015-09-24 07:18:15.000000000 +0200 +++ /var/tmp/diff_new_pack.WsPvRb/_new 2015-09-24 07:18:15.000000000 +0200 @@ -2,17 +2,50 @@ # Merge several PCI ID lists to a single one. This script tries to be as agnostic # of the details of the ID list as possible, so it should not break with future # changes of the ID list format as long as they follow the same block structure. -# Greetings to Kurt Garloff who needed 300+ lines of code to give a wrong -# solution of the same problem. +# +# Options: +# -v: Verbose mode. Warn if multiple files provide different definitions for +# the same device. # # (c) 2007 Martin Mares <m...@ucw.cz>, GPLv2 -# (c) 2013 Jean Delvare <jdelv...@suse.de> +# (c) 2013, 2015 Jean Delvare <jdelv...@suse.de> use strict; +use Getopt::Std; +use File::Copy; +use vars qw($IDSD_PATH $MASTER_IDS $PCI_IDS @idsd_files $output); + +$IDSD_PATH = "/usr/share/pci.ids.d"; +$MASTER_IDS = "/usr/share/pci.ids.d/pci.ids.dist"; +$PCI_IDS = "/usr/share/pci.ids"; + +our $opt_v; +getopts('v'); + +if (! -f $MASTER_IDS) { + print STDERR "ERROR: $MASTER_IDS not found, giving up\n"; + exit 1; +} + +sub collect_files($) +{ + my ($dir) = @_; + my ($file, @files); + + opendir(my $dh, $dir) || die "Could not open directory $dir: $!"; + # Ignore non-files and hidden files + while (defined ($file = readdir($dh))) { + push @files, "$dir/$file" if $file !~ m/^\./ && -f "$dir/$file"; + } + closedir($dh); + + return @files; +} my %ids = (); my %comments = (); -foreach our $file (@ARGV) { +@idsd_files = collect_files($IDSD_PATH); +foreach our $file (@idsd_files) { my $fn = ($file =~ /\.gz$/) ? "zcat $file |" : ($file =~ /\.bz2$/) ? "bzcat $file |" : $file; open F, $fn or die "Unable to open $file: $!"; my @id = (); @@ -20,6 +53,10 @@ my $class = 0; sub err($) { print STDERR "Error in $file, line $.: @_\n"; + # If merging fails for whatever reason, fallback to master file copy + print STDERR "WARNING: Merge not successful, using master pci.ids file\n"; + copy($MASTER_IDS, $PCI_IDS) || die "Could not copy $MASTER_IDS to $PCI_IDS: $!"; + chmod(0644, "$PCI_IDS"); exit 1; } while (<F>) { @@ -44,7 +81,7 @@ $class = ($id =~ /^C\s/) if !$depth; # Remember if we are in a vendor or a class section my $i = join(":", @id); my $j = $class ? "~$i" : $i; # We want to sort special entries last - if (exists $ids{$j} && $ids{$j} ne $name) { + if ($opt_v && exists $ids{$j} && $ids{$j} ne $name) { print STDERR "Warning: ID $i has two different definitions, using the one from $file\n"; } $ids{$j} = $name; @@ -57,13 +94,18 @@ close F; } -print "# This file has been merged automatically from the following files:\n#\t", join("\n#\t", @ARGV), "\n\n"; +# Write to a temporary file to avoid a race condition with lspci +open($output, ">", "$PCI_IDS.part") || die "Could not write to $PCI_IDS.part: $!"; +print $output "# This file has been merged automatically from the following files:\n#\t", join("\n#\t", @idsd_files), "\n\n"; foreach my $id (sort keys %ids) { my ($i, $j) = ($id, $id); $i =~ s/[^:]//g; $i =~ tr/:/\t/; $j =~ s/.*://g; $j =~ s/^~//; - print $comments{$id} if $comments{$id}; - print "$i$j $ids{$id}\n"; + print $output $comments{$id} if $comments{$id}; + print $output "$i$j $ids{$id}\n"; } +close($output); +rename("$PCI_IDS.part", "$PCI_IDS") || die "Could not rename $PCI_IDS.part to $PCI_IDS: $!"; +chmod(0644, "$PCI_IDS"); ++++++ pci.ids.bz2 ++++++ --- /var/tmp/diff_new_pack.WsPvRb/_old 2015-09-24 07:18:15.000000000 +0200 +++ /var/tmp/diff_new_pack.WsPvRb/_new 2015-09-24 07:18:15.000000000 +0200 @@ -1,11 +1,11 @@ # # List of PCI ID's # -# Version: 2015.09.07 -# Date: 2015-09-07 03:15:01 +# Version: 2015.09.19 +# Date: 2015-09-19 16:01:04 # -# Maintained by Martin Mares <m...@ucw.cz> and other volunteers from the -# PCI ID Project at http://pci-ids.ucw.cz/. +# Maintained by Albert Pool, Martin Mares, and other volunteers from +# the PCI ID Project at http://pci-ids.ucw.cz/. # # New data are always welcome, especially if they are accurate. If you have # anything to contribute, please follow the instructions at the web site. @@ -16342,32 +16342,32 @@ 103c 703b NC373i Integrated Multifunction Gigabit Server Adapter 103c 703d NC373F PCI Express Multifunction Gigabit Server Adapter 16ad NetXtreme II BCM57840 10/20 Gigabit Ethernet Virtual Function - 103c 1916 HP FlexFabric 20Gb 2-port 630FLB Adapter - 103c 1917 HP FlexFabric 20Gb 2-port 630M Adapter + 103c 1916 FlexFabric 20Gb 2-port 630FLB Adapter + 103c 1917 FlexFabric 20Gb 2-port 630M Adapter 103c 2231 3820C 10/20Gb Converged Network Adapter (SR-IOV VF) 103c 22fa FlexFabric 10Gb 2-port 536FLB Adapter (SR-IOV VF) 16ae NetXtreme II BCM57810 10 Gigabit Ethernet Multi Function - 103c 1798 HP NPAR 10Gb 2-port 530FLB Adapter - 103c 17a5 HP NPAR 10Gb 2-port 530M Adapter - 103c 18d3 HP NPAR 10Gb 2-port 530T Adapter - 103c 1930 HP NPAR 10Gb 2-port 534FLR-SFP+ Adapter - 103c 1931 HP NPAR CN1100R Dual Port Converged Network Adapter - 103c 1932 HP NPAR 10Gb 2-port 534FLB Adapter - 103c 1933 HP NPAR 10Gb 2-port 534M Adapter - 103c 193a HP NPAR 10Gb 2-port 533FLR-T Adapter - 103c 3382 HP NPAR 10Gb 2-port 530FLR-SFP+ Adapter - 103c 339d HP NPAR 10Gb 2-port 530SFP+ Adapter + 103c 1798 NPAR 10Gb 2-port 530FLB Adapter + 103c 17a5 NPAR 10Gb 2-port 530M Adapter + 103c 18d3 NPAR 10Gb 2-port 530T Adapter + 103c 1930 NPAR 10Gb 2-port 534FLR-SFP+ Adapter + 103c 1931 NPAR CN1100R Dual Port Converged Network Adapter + 103c 1932 NPAR 10Gb 2-port 534FLB Adapter + 103c 1933 NPAR 10Gb 2-port 534M Adapter + 103c 193a NPAR 10Gb 2-port 533FLR-T Adapter + 103c 3382 NPAR 10Gb 2-port 530FLR-SFP+ Adapter + 103c 339d NPAR 10Gb 2-port 530SFP+ Adapter 16af NetXtreme II BCM57810 10 Gigabit Ethernet Virtual Function - 103c 1798 HP Flex-10 10Gb 2-port 530FLB Adapter - 103c 17a5 HP Flex-10 10Gb 2-port 530M Adapter - 103c 18d3 HP Ethernet 10Gb 2-port 530T Adapter - 103c 1930 HP FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter - 103c 1931 HP StoreFabric CN1100R Dual Port Converged Network Adapter - 103c 1932 HP FlexFabric 10Gb 2-port 534FLB Adapter - 103c 1933 HP FlexFabric 10Gb 2-port 534M Adapter - 103c 193a HP FlexFabric 10Gb 2-port 533FLR-T Adapter - 103c 3382 HP Ethernet 10Gb 2-port 530FLR-SFP+ Adapter - 103c 339d HP Ethernet 10Gb 2-port 530SFP+ Adapter + 103c 1798 Flex-10 10Gb 2-port 530FLB Adapter + 103c 17a5 Flex-10 10Gb 2-port 530M Adapter + 103c 18d3 Ethernet 10Gb 2-port 530T Adapter + 103c 1930 FlexFabric 10Gb 2-port 534FLR-SFP+ Adapter + 103c 1931 StoreFabric CN1100R Dual Port Converged Network Adapter + 103c 1932 FlexFabric 10Gb 2-port 534FLB Adapter + 103c 1933 FlexFabric 10Gb 2-port 534M Adapter + 103c 193a FlexFabric 10Gb 2-port 533FLR-T Adapter + 103c 3382 Ethernet 10Gb 2-port 530FLR-SFP+ Adapter + 103c 339d Ethernet 10Gb 2-port 530SFP+ Adapter 16b0 NetXtreme BCM57761 Gigabit Ethernet PCIe 16b1 NetLink BCM57781 Gigabit Ethernet PCIe 1849 96b1 Z77 Extreme4 motherboard @@ -17552,15 +17552,15 @@ 1642 Bitland(ShenZhen) Information Technology Co., Ltd. 1657 Brocade Communications Systems, Inc. 0013 425/825/42B/82B 4Gbps/8Gbps PCIe dual port FC HBA - 103c 1742 HP 82B 8Gbps dual port FC HBA - 103c 1744 HP 42B 4Gbps dual port FC HBA + 103c 1742 82B 8Gbps dual port FC HBA + 103c 1744 42B 4Gbps dual port FC HBA 1657 0014 425/825 4Gbps/8Gbps PCIe dual port FC HBA 0014 1010/1020/1007/1741 10Gbps CNA 1657 0014 1010/1020/1007/1741 10Gbps CNA - FCOE 1657 0015 1010/1020/1007/1741 10Gbps CNA - LL 0017 415/815/41B/81B 4Gbps/8Gbps PCIe single port FC HBA - 103c 1741 HP 41B 4Gbps single port FC HBA - 103c 1743 HP 81B 8Gbps single port FC HBA + 103c 1741 41B 4Gbps single port FC HBA + 103c 1743 81B 8Gbps single port FC HBA 1657 0014 415/815 4Gbps/8Gbps single port PCIe FC HBA 0021 804 8Gbps FC HBA for HP Bladesystem c-class # AnyIO Adapter @@ -18423,6 +18423,7 @@ 5390 RT5390 Wireless 802.11n 1T/1R PCIe 103c 1636 U98Z077.00 Half-size Mini PCIe Card 5392 RT5392 PCIe Wireless Network Adapter + 539b RT5390R 802.11bgn PCIe Wireless Network Adapter 539f RT5390 [802.11 b/g/n 1T1R G-band PCI Express Single Chip] 103c 1637 Pavilion DM1Z-3000 PCIe wireless card 5592 RT5592 PCIe Wireless Network Adapter @@ -21269,7 +21270,7 @@ 8086 1199 PRO/1000 GT Quad Port Server Adapter 10b6 82598 10GbE PCI-Express Ethernet Controller 10b9 82572EI Gigabit Ethernet Controller (Copper) - 103c 704a HP 110T PCIe Gigabit Server Adapter + 103c 704a 110T PCIe Gigabit Server Adapter 8086 1083 PRO/1000 PT Desktop Adapter 8086 1093 PRO/1000 PT Desktop Adapter 10ba 80003ES2LAN Gigabit Ethernet Controller (Copper) @@ -22489,7 +22490,7 @@ 104d 80df Vaio PCG-FX403 2448 82801 Mobile PCI Bridge 1028 040b Latitude E6510 - 103c 0934 HP Compaq nw8240 Mobile Workstation + 103c 0934 Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 103c 309f Compaq nx9420 Notebook 103c 30a3 Compaq nw8440 @@ -23134,7 +23135,7 @@ e4bf 0cd3 CD3-JIVE e4bf 58b1 XB1 2591 Mobile 915GM/PM Express PCI Express Root Port - 103c 0934 HP Compaq nw8240 Mobile Workstation + 103c 0934 Compaq nw8240 Mobile Workstation 2592 Mobile 915GM/GMS/910GML Express Graphics Controller 103c 099c NX6110/NC6120 103c 308a NC6220 @@ -23384,13 +23385,13 @@ e4bf 0cd3 CD3-JIVE e4bf 58b1 XB1 2660 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 1 - 103c 0934 HP Compaq nw8240 Mobile Workstation + 103c 0934 Compaq nw8240 Mobile Workstation 103c 099c NX6110/NC6120 e4bf 0ccd CCD-CALYPSO e4bf 0cd3 CD3-JIVE e4bf 58b1 XB1 2662 82801FB/FBM/FR/FW/FRW (ICH6 Family) PCI Express Port 2 - 103c 0934 HP Compaq nw8240 Mobile Workstation + 103c 0934 Compaq nw8240 Mobile Workstation e4bf 0ccd CCD-CALYPSO e4bf 0cd3 CD3-JIVE e4bf 58b1 XB1 @@ -24051,7 +24052,7 @@ 1028 01f9 Dell Latitude D630 1028 01ff Dell Precision M4300 1028 0256 Studio 1735 - 103c 2802 HP Compaq dc7700p + 103c 2802 Compaq dc7700p 103c 30c0 Compaq 6710b 103c 30c1 Compaq 6910p 103c 30cc Pavilion dv6700 @@ -25291,7 +25292,7 @@ 15d9 060d C7SIM-Q Motherboard 3b23 5 Series/3400 Series Chipset 4 port SATA AHCI Controller 3b25 5 Series/3400 Series Chipset SATA RAID Controller - 103c 3118 HP Smart Array B110i SATA RAID Controller + 103c 3118 Smart Array B110i SATA RAID Controller 3b26 5 Series/3400 Series Chipset 2 port SATA IDE Controller 3b28 5 Series/3400 Series Chipset 4 port SATA IDE Controller 144d c06a R730 Laptop
