Pārlūkot izejas kodu

[build] Include UNDI PCI driver within all-drivers build

Commit 9b99d2a ("[build] Avoid generating ROMs with "match-any" vendor
or device IDs") introduced a regression which caused the UNDI PCI
driver to be omitted from the list of all drivers, and thus to be
excluded from the all-drivers build.

Fix by ensuring that the per-driver section of the Makefile is
generated even when there are no ROMs to be built.

Reported-by: Sven Dreyer <sven@dreyer-net.de>
Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 12 gadus atpakaļ
vecāks
revīzija
c46acda672
1 mainītis faili ar 1 papildinājumiem un 1 dzēšanām
  1. 1
    1
      src/util/parserom.pl

+ 1
- 1
src/util/parserom.pl Parādīt failu

@@ -28,6 +28,7 @@ sub rom {
28 28
     $printed_family = 1;
29 29
   }
30 30
   print "\n";
31
+  return if ( $vendor && ( ( $vendor eq "ffff" ) || ( $device eq "ffff" ) ) );
31 32
   print "# NIC\t$image\t$ids\t$desc\n";
32 33
   print "DRIVER_$image = $driver_name\n";
33 34
   print "ROM_TYPE_$image = $type\n";
@@ -49,7 +50,6 @@ while ( <DRV> ) {
49 50
          \s*.*\s*		   # Driver data
50 51
        \)/x ) {
51 52
     ( my $vendor, my $device, my $image, my $desc ) = ( lc $1, lc $2, $3, $4 );
52
-    next if ( $vendor eq "ffff" ) || ( $device eq "ffff" );
53 53
     rom ( "pci", lc "${vendor}${device}", $desc, $vendor, $device );
54 54
     rom ( "pci", $image, $desc, $vendor, $device, 1 );
55 55
   } elsif ( /^\s*ISA_ROM\s*\(

Notiek ielāde…
Atcelt
Saglabāt