commit:     5c0244db6e0f35e15d10aa3521dc5066461e5ada
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 14:02:38 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 15:52:22 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=5c0244db

portage/isos: update prune_firmwares.sh & apply a few changes

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 .../isos/savedconfig/sys-kernel/linux-firmware     | 78 +++++++++++-----------
 .../isos/savedconfig/sys-kernel/prune_firmwares.sh |  3 +
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/releases/portage/isos/savedconfig/sys-kernel/linux-firmware 
b/releases/portage/isos/savedconfig/sys-kernel/linux-firmware
index 89110dba..5b6d5e15 100644
--- a/releases/portage/isos/savedconfig/sys-kernel/linux-firmware
+++ b/releases/portage/isos/savedconfig/sys-kernel/linux-firmware
@@ -1,4 +1,4 @@
-# Ben Kohler <bkoh...@gentoo.org> (2024-02-23)
+# Ben Kohler <bkoh...@gentoo.org> (2024-02-24)
 # Last updated for linux-firmware-20240220-r1
 # Remove files that shall not be installed from this list.
 3com/typhoon.bin
@@ -40,8 +40,8 @@ advansys/3550.bin
 advansys/38C0800.bin
 agere_ap_fw.bin
 agere_sta_fw.bin
-airoha/EthMD32.dm.bin
-airoha/EthMD32.DSP.bin
+#airoha/EthMD32.dm.bin
+#airoha/EthMD32.DSP.bin
 #amd/amd_sev_fam19h_model0xh.sbin
 #amd/amd_sev_fam17h_model0xh.sbin
 #amd/amd_sev_fam19h_model1xh.sbin
@@ -2498,52 +2498,52 @@ intel/ibt-20-1-3.sfi
 intel/ibt-19-240-4.ddc
 intel/ibt-11-5.sfi
 intel/dsp_fw_kbl_v2630.bin
-intel/vsc/ivsc_skucfg_ovti9734_0_1.bin
-intel/vsc/ivsc_skucfg_ovti5678_0_1.bin
-intel/vsc/ivsc_pkg_ovti01a0_0.bin
-intel/vsc/ivsc_skucfg_ovti02e1_0_1.bin
-intel/vsc/ivsc_pkg_himx2170_0.bin
-intel/vsc/ivsc_skucfg_ovti01a0_0_1.bin
-intel/vsc/ivsc_skucfg_ovti01af_0_1.bin
-intel/vsc/ivsc_skucfg_ovti2740_0_1.bin
-intel/vsc/ivsc_fw.bin
-intel/vsc/ivsc_skucfg_ovti01as_0_1.bin
-intel/vsc/ivsc_pkg_ovti9734_0.bin
-intel/vsc/ivsc_pkg_ovti01as_0.bin
-intel/vsc/ivsc_skucfg_himx2170_0_1.bin
-intel/vsc/ivsc_skucfg_ovti02c1_0_1.bin
-intel/vsc/ivsc_skucfg_ovti9738_0_1.bin
-intel/vsc/ivsc_pkg_ovti02e1_0.bin
-intel/vsc/ivsc_pkg_int3537_0.bin
-intel/vsc/ivsc_pkg_ovti5678_0.bin
-intel/vsc/ivsc_skucfg_himx11b1_0_1.bin
-intel/vsc/ivsc_pkg_ovti9738_0.bin
-intel/vsc/ivsc_pkg_himx11b1_0.bin
-intel/vsc/ivsc_pkg_ovti01af_0.bin
-intel/vsc/ivsc_skucfg_hi556_0_1.bin
-intel/vsc/ivsc_pkg_ovti02c1_0.bin
-intel/vsc/ivsc_pkg_himx2172_0.bin
-intel/vsc/ivsc_pkg_hi556_0.bin
-intel/vsc/ivsc_skucfg_int3537_0_1.bin
-intel/vsc/ivsc_pkg_ovti2740_0.bin
-intel/vsc/ivsc_skucfg_himx2172_0_1.bin
+#intel/vsc/ivsc_skucfg_ovti9734_0_1.bin
+#intel/vsc/ivsc_skucfg_ovti5678_0_1.bin
+#intel/vsc/ivsc_pkg_ovti01a0_0.bin
+#intel/vsc/ivsc_skucfg_ovti02e1_0_1.bin
+#intel/vsc/ivsc_pkg_himx2170_0.bin
+#intel/vsc/ivsc_skucfg_ovti01a0_0_1.bin
+#intel/vsc/ivsc_skucfg_ovti01af_0_1.bin
+#intel/vsc/ivsc_skucfg_ovti2740_0_1.bin
+#intel/vsc/ivsc_fw.bin
+#intel/vsc/ivsc_skucfg_ovti01as_0_1.bin
+#intel/vsc/ivsc_pkg_ovti9734_0.bin
+#intel/vsc/ivsc_pkg_ovti01as_0.bin
+#intel/vsc/ivsc_skucfg_himx2170_0_1.bin
+#intel/vsc/ivsc_skucfg_ovti02c1_0_1.bin
+#intel/vsc/ivsc_skucfg_ovti9738_0_1.bin
+#intel/vsc/ivsc_pkg_ovti02e1_0.bin
+#intel/vsc/ivsc_pkg_int3537_0.bin
+#intel/vsc/ivsc_pkg_ovti5678_0.bin
+#intel/vsc/ivsc_skucfg_himx11b1_0_1.bin
+#intel/vsc/ivsc_pkg_ovti9738_0.bin
+#intel/vsc/ivsc_pkg_himx11b1_0.bin
+#intel/vsc/ivsc_pkg_ovti01af_0.bin
+#intel/vsc/ivsc_skucfg_hi556_0_1.bin
+#intel/vsc/ivsc_pkg_ovti02c1_0.bin
+#intel/vsc/ivsc_pkg_himx2172_0.bin
+#intel/vsc/ivsc_pkg_hi556_0.bin
+#intel/vsc/ivsc_skucfg_int3537_0_1.bin
+#intel/vsc/ivsc_pkg_ovti2740_0.bin
+#intel/vsc/ivsc_skucfg_himx2172_0_1.bin
 intel/ibt-0040-1020.ddc
 intel/ibt-0041-0041.sfi
 intel/ibt-0040-0041.sfi
 intel/ibt-19-32-1.sfi
 intel/ibt-0180-0041.sfi
 intel/ibt-0040-2120.ddc
-intel/ipu/ipu6ep_fw.bin
-intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
-intel/ipu/ipu6epadln_fw.bin
-intel/ipu/ipu6_fw.bin
-intel/ipu/ipu6epmtl_fw.bin
-intel/ipu/ipu6se_fw.bin
+#intel/ipu/ipu6ep_fw.bin
+#intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
+#intel/ipu/ipu6epadln_fw.bin
+#intel/ipu/ipu6_fw.bin
+#intel/ipu/ipu6epmtl_fw.bin
+#intel/ipu/ipu6se_fw.bin
 intel/catpt/bdw/dsp_basefw.bin
 intel/ibt-0040-0041.ddc
 intel/dsp_fw_glk.bin
 intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq
-intel/ipu3-fw.bin
+#intel/ipu3-fw.bin
 intel/ibt-20-1-4.ddc
 intel/dsp_fw_release_v969.bin
 intel/dsp_fw_glk_v2768.bin

diff --git a/releases/portage/isos/savedconfig/sys-kernel/prune_firmwares.sh 
b/releases/portage/isos/savedconfig/sys-kernel/prune_firmwares.sh
index ef43b4ac..abb87c33 100755
--- a/releases/portage/isos/savedconfig/sys-kernel/prune_firmwares.sh
+++ b/releases/portage/isos/savedconfig/sys-kernel/prune_firmwares.sh
@@ -16,6 +16,7 @@ echo "# Last updated for $(basename ${1})" >> linux-firmware
 
 sed    -e's/^a300/#a300/' \
        -e 's/^amd/#amd/' \
+       -e 's/^airoha/#airoha/' \
        -e 's/^atusb/#atusb/' \
        -e 's/^av7110/#av7110/' \
        -e 's/^cadence/#cadence/' \
@@ -30,6 +31,8 @@ sed   -e's/^a300/#a300/' \
        -e 's/^go7007/#go7007/' \
        -e 's/^hfi1/#hfi1/' \
        -e 's/^i915/#i915/' \
+       -e 's%^intel/vsc%#intel/vsc%' \
+       -e 's%^intel/ipu%#intel/ipu%' \
        -e 's/^isdbt/#isdbt/' \
        -e 's/^keyspan/#keyspan/' \
        -e 's/^liquidio/#liquidio/' \

Reply via email to