As once added to the list we never check if it'd be available now we have some unnecessary entries in the skip list, which this patch cleans up. Produced by deleting all skip list entries and successive re-adding them by doing: ./assemble-firmware.pl fwlist-FILE /tmp) 2>&1 | awk '/unable/ { print $5 }' >> skip-cleanedup and adding only those which are now not found.
The "additions" come from those lines were previously multiple skipped fws were placed on a single one. We could also add support for such checks in the assemble-firmware script, wouldn't be to hard, but for now do this as a starter. Signed-off-by: Thomas Lamprecht <t.lampre...@proxmox.com> --- assemble-firmware.pl | 89 ++++---------------------------------------- 1 file changed, 8 insertions(+), 81 deletions(-) diff --git a/assemble-firmware.pl b/assemble-firmware.pl index 5f7fb48..e4510da 100755 --- a/assemble-firmware.pl +++ b/assemble-firmware.pl @@ -34,33 +34,14 @@ FW13 RTL8192U/boot.img RTL8192U/data.img RTL8192U/main.img -amdgpu/raven_ce.bin -amdgpu/raven_gpu_info.bin -amdgpu/raven_me.bin -amdgpu/raven_mec.bin -amdgpu/raven_mec2.bin -amdgpu/raven_pfp.bin -amdgpu/raven_rlc.bin -amdgpu/raven_sdma.bin -amdgpu/raven_vcn.bin ar9170.fw ast_dp501_fw.bin -ath10k/QCA6174/hw2.1/board-2.bin -ath10k/QCA6174/hw2.1/board.bin ath10k/QCA6174/hw2.1/firmware-4.bin -ath10k/QCA6174/hw2.1/firmware-5.bin -ath10k/QCA6174/hw3.0/board-2.bin -ath10k/QCA6174/hw3.0/board.bin -ath10k/QCA6174/hw3.0/firmware-4.bin ath10k/QCA6174/hw3.0/firmware-5.bin -ath10k/QCA9377/hw1.0/board.bin -ath10k/QCA9377/hw1.0/firmware-5.bin ath10k/QCA9887/hw1.0/board-2.bin ath10k/QCA988X/hw2.0/board-2.bin -ath10k/QCA988X/hw2.0/board.bin ath10k/QCA988X/hw2.0/firmware-2.bin ath10k/QCA988X/hw2.0/firmware-3.bin -ath10k/QCA988X/hw2.0/firmware-5.bin ath10k/QCA988X/hw2.0/firmware.bin ath6k/AR6003/hw2.0/bdata.bin ath6k/AR6003/hw2.1.1/bdata.bin @@ -95,22 +76,17 @@ bfubase.frm brcm/brcmfmac-sdio.bin brcm/brcmfmac-sdio.txt brcm/brcmfmac43143-sdio.txt -brcm/brcmfmac43143.bin brcm/brcmfmac43241b0-sdio.txt brcm/brcmfmac43241b4-sdio.txt brcm/brcmfmac43241b5-sdio.txt -brcm/brcmfmac43242a.bin brcm/brcmfmac4329-sdio.txt brcm/brcmfmac4330-sdio.txt brcm/brcmfmac4334-sdio.txt brcm/brcmfmac43340-sdio.txt brcm/brcmfmac4335-sdio.txt brcm/brcmfmac43362-sdio.txt -brcm/brcmfmac4339-sdio.bin brcm/brcmfmac4339-sdio.txt -brcm/brcmfmac43430-sdio.bin brcm/brcmfmac43430-sdio.txt -brcm/brcmfmac43430a0-sdio.bin brcm/brcmfmac43455-sdio.txt brcm/brcmfmac4350-pcie.txt brcm/brcmfmac4354-pcie.bin @@ -118,7 +94,6 @@ brcm/brcmfmac4354-pcie.txt brcm/brcmfmac4354-sdio.txt brcm/brcmfmac4356-pcie.txt brcm/brcmfmac43570-pcie.txt -brcm/brcmfmac4358-pcie.bin brcm/brcmfmac4358-pcie.txt brcm/brcmfmac4359-pcie.bin brcm/brcmfmac43602-pcie.txt @@ -126,26 +101,21 @@ brcm/brcmfmac4365b-pcie.bin brcm/brcmfmac4365b-pcie.txt brcm/brcmfmac4365c-pcie.bin brcm/brcmfmac4366b-pcie.txt -brcm/brcmfmac4366c-pcie.bin brcm/brcmfmac4371-pcie.txt c218tunx.cod c320tunx.cod -cbfw-3.1.0.0.bin -cbfw.bin cbfw-3.0.3.1.bin +cbfw-3.0.3.1.bin +cbfw.bin comedi/jr3pci.idm cp204unx.cod -ct2fw-3.1.0.0.bin -ctfw-3.1.0.0.bin -ctfw.bin ct2fw.bin ctfw-3.0.3.1.bin ct2fw-3.0.3.1.bin +ct2fw-3.0.3.1.bin +ct2fw.bin +ctfw-3.0.3.1.bin +ctfw.bin cxgb4/t4fw-1.3.10.0.bin -cxgb4/t4fw.bin -cxgb4/t5fw.bin -cxgb4/t6fw.bin cyzfirm.bin daqboard2000_firmware.bin fw.ram.bin -go7007fw.bin -go7007tv.bin i1480-phy-0.0.bin i1480-pre-phy-0.0.bin i1480-usb-0.0.bin @@ -156,21 +126,15 @@ isi608.bin isi608em.bin isi616em.bin isight.fw -isl3877 -isl3886 isl3886pci isl3886usb isl3887usb -isl3890 iwlwifi-100-6.ucode iwlwifi-1000-6.ucode iwlwifi-130-5.ucode -iwlwifi-3160-IWL3160_UCODE_API_OK.ucode iwlwifi-3165-10.ucode iwlwifi-3168-26.ucode iwlwifi-6000-6.ucode -iwlwifi-6000g2a-4.ucode -iwlwifi-6000g2a-6.ucode iwlwifi-7265D-26.ucode iwlwifi-8000-10.ucode iwlwifi-8000-12.ucode @@ -198,16 +162,15 @@ iwlwifi-Qu-a0-jf-b0-34.ucode iwlwifi-QuQnj-a0-hr-a0-34.ucode iwlwifi-QuQnj-a0-jf-b0-34.ucode iwlwifi-QuQnj-f0-hr-a0-34.ucode -iwmc3200top.1.fw iwmc3200wifi-calib-sdio.bin iwmc3200wifi-lmac-sdio.bin iwmc3200wifi-umac-sdio.bin ks7010sd.rom lattice-ecp3.bit -lbtf_usb.bin libertas/cf8305.bin -libertas/gspi8385.bin libertas/gspi8385_hlp.bin +libertas/gspi8385.bin libertas/gspi8385_helper.bin +libertas/gspi8385_hlp.bin libertas/usb8388.bin libertas_cs.fw libertas_cs_helper.fw @@ -220,20 +183,10 @@ me4000_firmware.bin mrvl/pcie8766_uapsta.bin mrvl/pcie8997_uapsta.bin mrvl/sd8786_uapsta.bin -mrvl/sd8897_uapsta.bin mrvl/sd8997_uapsta.bin -mrvl/usb8801_uapsta.bin mrvl/usb8997_uapsta.bin -mrvl/usbusb8997_combo_v4.bin -mt7601u.bin mwl8k/fmimage_8363.fw -mwl8k/fmimage_8366.fw mwl8k/helper_8363.fw -mwl8k/helper_8366.fw -myri10ge_eth_z8e.dat -myri10ge_ethp_z8e.dat -myri10ge_rss_eth_z8e.dat -myri10ge_rss_ethp_z8e.dat ni6534a.bin niscrb01.bin niscrb02.bin @@ -246,31 +199,10 @@ phanfw-4.0.579.bin prism2_ru.fw prism_ap_fw.bin prism_sta_fw.bin -radeon/bonaire_sdma1.bin -radeon/bonaire_uvd.bin -radeon/bonaire_vce.bin -radeon/boniare_mc.bin -radeon/hawaii_sdma1.bin -radeon/hawaii_uvd.bin -radeon/hawaii_vce.bin -radeon/kabini_sdma1.bin -radeon/kabini_uvd.bin -radeon/kabini_vce.bin -radeon/kaveri_sdma1.bin -radeon/kaveri_uvd.bin -radeon/kaveri_vce.bin -radeon/mullins_sdma1.bin -radeon/mullins_uvd.bin -radeon/mullins_vce.bin rtlwifi/rtl8723bu_bt.bin rtlwifi/rtl8723efw.bin sd8686.bin sd8686_helper.bin -sep/cache.image.bin -sep/resident.image.bin -sms1xxx-nova-a-dvbt-01.fw -sms1xxx-nova-b-dvbt-01.fw -sms1xxx-stellar-dvbt-01.fw softing-4.6/bcard.bin softing-4.6/bcard2.bin softing-4.6/cancard.bin @@ -289,12 +221,7 @@ tms380tr.bin usb8388.bin wd719x-risc.bin wd719x-wcs.bin -wil6210.board -wil6210.brd -wil6210.fw wil6210_sparrow_plus.fw -wl1251-fw.bin -wl1271-fw.bin wlan/prima/WCNSS_qcom_wlan_nv.bin zd1201-ap.fw zd1201.fw -- 2.20.1 _______________________________________________ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel