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

mcb30 · mcb30 · commit c46acda67200 · 2011-11-16T00:22:30.000Z
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>
diff --git a/src/util/parserom.pl b/src/util/parserom.pl
@@ -28,6 +28,7 @@ sub rom {
     $printed_family = 1;
   }
   print "\n";
+  return if ( $vendor && ( ( $vendor eq "ffff" ) || ( $device eq "ffff" ) ) );
   print "# NIC\t$image\t$ids\t$desc\n";
   print "DRIVER_$image = $driver_name\n";
   print "ROM_TYPE_$image = $type\n";
@@ -49,7 +50,6 @@ sub rom {
          \s*.*\s*		   # Driver data
        \)/x ) {
     ( my $vendor, my $device, my $image, my $desc ) = ( lc $1, lc $2, $3, $4 );
-    next if ( $vendor eq "ffff" ) || ( $device eq "ffff" );
     rom ( "pci", lc "${vendor}${device}", $desc, $vendor, $device );
     rom ( "pci", $image, $desc, $vendor, $device, 1 );
   } elsif ( /^\s*ISA_ROM\s*\(
