bump version to 3.5-2

[pve-firmware.git] / assemble-firmware.pl

diff --git a/assemble-firmware.pl b/assemble-firmware.pl
index e0666c717f7447e30b230aa3839a8cb01e0cf5b1..07ec09fed4f312e7d3989923a3f4959aa3761c88 100755 (executable)
--- a/assemble-firmware.pl
+++ b/assemble-firmware.pl
@@ -15,7 +15,7 @@ die "no firmware list specified" if !$fwlist || ! -f $fwlist;
 my $target = shift;
 die "no target directory" if !$target || ! -d $target;
 
-my $skip = {};
+my $ALLOW_MISSING = {};
 # debian squeeze also misses those files
 foreach my $fw (qw(
 3826.arm
@@ -318,6 +318,8 @@ ql2600_fw.bin
 ql2700_fw.bin
 ql8100_fw.bin
 ql8300_fw.bin
+regulatory.db
+regulatory.db.p7s
 renesas_usb_fw.mem
 rtl_bt/rtl8723b_config.bin
 rtl_bt/rtl8723bs_config.bin
@@ -355,7 +357,7 @@ wlwifi-SoSnj-a0-mr-a0-59.ucode
 zd1201-ap.fw
 zd1201.fw
 )) {
-    $skip->{$fw} = 1;
+    $ALLOW_MISSING->{$fw} = 1;
 }
 
 sub copy_fw {
@@ -379,6 +381,8 @@ while(defined(my $line = <$fd>)) {
     chomp $line;
     my ($fw, $mod) = split(/\s+/, $line, 2);
 
+    next if $fw =~ m/\b(?:microcode_amd|amd_sev_)/; # contained in amd64-microcode
+
     my $fw_name = basename($fw);
     $fwbase_name->{$fw_name} = 1;
 
@@ -386,18 +390,15 @@ while(defined(my $line = <$fd>)) {
     next if $mod =~ m|^kernel/drivers/isdn|;
 
     # skip ZyDas usb wireless, use package zd1211-firmware instead
-    next if $fw =~ m|^zd1211/|; 
+    next if $fw =~ m|^zd1211/|;
 
-    # skip atmel at76c50x wireless networking chips.
-    # use package atmel-firmware instead
+    # skip atmel at76c50x wireless networking chips, use package atmel-firmware instead
     next if $fw =~ m|^atmel_at76c50|;
 
-    # skip Bluetooth dongles based on the Broadcom BCM203x 
-    # use package bluez-firmware instead
+    # skip Bluetooth dongles based on the Broadcom BCM203x, use package bluez-firmware instead
     next if $fw =~ m|^BCM2033|;
 
     next if $fw =~ m|^xc3028-v27\.fw|; # found twice!
-    next if $fw =~ m|.inp|; # where are those files?
     next if $fw =~ m|^ueagle-atm/|; # where are those files?
 
     next if $fwdone->{$fw};
@@ -414,9 +415,9 @@ while(defined(my $line = <$fd>)) {
     if ($fw eq 'PE520.cis') {
        $fw = 'cis/PE520.cis';
     }
- 
+
     if (-e "$target/$fw") {
-       warn "WARN: allowed to skip existing '$fw'\n" if $skip->{$fw};
+       warn "WARN: allowed to skip existing '$fw'\n" if $ALLOW_MISSING->{$fw};
        next;
     }
     if (-f "$fwsrc3/$fw") {
@@ -436,17 +437,17 @@ while(defined(my $line = <$fd>)) {
                my $f_name = basename($f);
                $fwbase_name->{$f_name} = 1;
            }
-           warn "WARN: allowed to skip existing '$fw'\n" if $skip->{$fw};
+           warn "WARN: allowed to skip existing '$fw'\n" if $ALLOW_MISSING->{$fw};
            next;
        } else {
-           next if $skip->{$fw};
+           next if $ALLOW_MISSING->{$fw};
            warn "ERROR: unable to find FW for GLOB ($module): $fw\n";
            $error++;
        }
     }
 
     if ($fw =~ m|/|) {
-       next if $skip->{$fw};
+       next if $ALLOW_MISSING->{$fw};
 
        warn "ERROR: unable to find firmware ($module): $fw\n";
        $error++;
@@ -482,8 +483,8 @@ while(defined(my $line = <$fd>)) {
        next;
     }
 
-    next if $skip->{$fw};
-    next if $fw =~ m|^dvb-|;
+    next if $ALLOW_MISSING->{$fw};
+    next if $fw =~ m|^dvb-| || $fw =~ m|\.inp$|;
 
     warn "ERROR: unable to find firmware ($module): $fw\n";
     $error++;