[PATCH 1/2] alsa: Do not ship compressed firmware again

[PATCH 1/2] alsa: Do not ship compressed firmware again

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2321 bytes --]

This package installs some firmware files. Since linux-firmware is now
compressed, files will no longer be overwritten, but this package will
put the uncompressed files next to the compressed ones.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/packages/alsa | 14 ++++++++++++++
 lfs/alsa                       |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa
index a704727ec..5fac49ce3 100644
--- a/config/rootfiles/packages/alsa
+++ b/config/rootfiles/packages/alsa
@@ -17,6 +17,8 @@ lib/firmware/cs46xx/cwcdma
 lib/firmware/cs46xx/cwcsnoop
 lib/firmware/ctefx-desktop.bin
 lib/firmware/ctefx-r3di.bin
+#lib/firmware/ctefx.bin
+#lib/firmware/ctspeq.bin
 lib/firmware/digiface_firmware.bin
 lib/firmware/digiface_firmware_rev11.bin
 #lib/firmware/ea
@@ -56,6 +58,9 @@ lib/firmware/emu/emu1010_notebook.fw
 lib/firmware/emu/emu1010b.fw
 lib/firmware/emu/hana.fw
 lib/firmware/emu/micro_dock.fw
+#lib/firmware/ess/maestro3_assp_kernel.fw
+#lib/firmware/ess/maestro3_assp_minisrc.fw
+#lib/firmware/korg/k1212.dsp
 #lib/firmware/mixart
 lib/firmware/mixart/miXart8.elf
 lib/firmware/mixart/miXart8.xlx
@@ -86,6 +91,11 @@ lib/firmware/pcxhr/xlxc882hr.dat
 lib/firmware/pcxhr/xlxc924.dat
 lib/firmware/pcxhr/xlxint.dat
 lib/firmware/rpm_firmware.bin
+#lib/firmware/sb16/alaw_main.csp
+#lib/firmware/sb16/ima_adpcm_capture.csp
+#lib/firmware/sb16/ima_adpcm_init.csp
+#lib/firmware/sb16/ima_adpcm_playback.csp
+#lib/firmware/sb16/mulaw_main.csp
 #lib/firmware/turtlebeach
 lib/firmware/turtlebeach/msndinit.bin
 lib/firmware/turtlebeach/msndperm.bin
@@ -105,6 +115,10 @@ lib/firmware/vx/x1_1_vp4.xlx
 lib/firmware/vx/x1_1_vx2.xlx
 lib/firmware/vx/x1_1_vxp.xlx
 lib/firmware/vx/x1_2_v22.xlx
+#lib/firmware/yamaha/ds1_ctrl.fw
+#lib/firmware/yamaha/ds1_dsp.fw
+#lib/firmware/yamaha/ds1e_ctrl.fw
+#lib/firmware/yamaha/yss225_registers.bin
 #lib/udev/rules.d/90-alsa-restore.rules
 usr/bin/aconnect
 usr/bin/alsabat
diff --git a/lfs/alsa b/lfs/alsa
index ab6eeca70..06c9eaa4b 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -37,7 +37,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 13
+PAK_VER    = 14
 
 DEPS       =
 
-- 
2.30.2

[PATCH 2/2] dvb-firmwares: Don't ship firmware that comes from linux-firmware

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2507 bytes --]

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/common/dvb-firmwares | 28 +++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/config/rootfiles/common/dvb-firmwares b/config/rootfiles/common/dvb-firmwares
index e9ec940c5..bcc89a5b1 100644
--- a/config/rootfiles/common/dvb-firmwares
+++ b/config/rootfiles/common/dvb-firmwares
@@ -1,3 +1,7 @@
+#lib/firmware/as102_data1_st.hex
+#lib/firmware/as102_data2_st.hex
+#lib/firmware/cmmb_vega_12mhz.inp
+#lib/firmware/cmmb_venice_12mhz.inp
 lib/firmware/dvb-fe-bcm3510-01.fw
 lib/firmware/dvb-fe-drxj-mc-1.0.8.fw
 lib/firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw
@@ -5,6 +9,9 @@ lib/firmware/dvb-fe-drxj-mc-vsb-qam-1.0.8.fw
 lib/firmware/dvb-fe-or51132-qam.fw
 lib/firmware/dvb-fe-or51132-vsb.fw
 lib/firmware/dvb-fe-or51211.fw
+#lib/firmware/dvb-fe-xc4000-1.4.1.fw
+#lib/firmware/dvb-fe-xc5000-1.6.114.fw
+#lib/firmware/dvb-fe-xc5000c-4.1.30.7.fw
 lib/firmware/dvb-ttpci-01.fw
 #lib/firmware/dvb-ttpci-01.fw-261a
 #lib/firmware/dvb-ttpci-01.fw-261b
@@ -14,9 +21,13 @@ lib/firmware/dvb-ttpci-01.fw
 #lib/firmware/dvb-ttpci-01.fw-2622
 lib/firmware/dvb-usb-avertv-a800-02.fw
 lib/firmware/dvb-usb-bluebird-01.fw
+#lib/firmware/dvb-usb-dib0700-1.20.fw
 lib/firmware/dvb-usb-dibusb-5.0.0.11.fw
 lib/firmware/dvb-usb-dibusb-6.0.0.8.fw
 lib/firmware/dvb-usb-dtt200u-01.fw
+#lib/firmware/dvb-usb-it9135-01.fw
+#lib/firmware/dvb-usb-it9135-02.fw
+#lib/firmware/dvb-usb-terratec-h5-drxk.fw
 lib/firmware/dvb-usb-terratec-h7-az6007.fw
 lib/firmware/dvb-usb-terratec-h7-drxk.fw
 lib/firmware/dvb-usb-umt-010-02.fw
@@ -24,4 +35,21 @@ lib/firmware/dvb-usb-vp702x-01.fw
 lib/firmware/dvb-usb-vp7045-01.fw
 lib/firmware/dvb-usb-wt220u-01.fw
 lib/firmware/dvb-usb-wt220u-02.fw
+#lib/firmware/dvb_nova_12mhz.inp
+#lib/firmware/dvb_nova_12mhz_b0.inp
+#lib/firmware/isdbt_nova_12mhz.inp
+#lib/firmware/isdbt_nova_12mhz_b0.inp
+#lib/firmware/isdbt_rio.inp
+#lib/firmware/sms1xxx-hcw-55xxx-dvbt-02.fw
+#lib/firmware/sms1xxx-hcw-55xxx-isdbt-02.fw
+#lib/firmware/sms1xxx-nova-a-dvbt-01.fw
+#lib/firmware/sms1xxx-nova-b-dvbt-01.fw
+#lib/firmware/sms1xxx-stellar-dvbt-01.fw
+#lib/firmware/tdmb_nova_12mhz.inp
+#lib/firmware/v4l-cx231xx-avcore-01.fw
+#lib/firmware/v4l-cx23418-apu.fw
+#lib/firmware/v4l-cx23418-cpu.fw
+#lib/firmware/v4l-cx23418-dig.fw
+#lib/firmware/v4l-cx23885-avcore-01.fw
 lib/firmware/v4l-cx23885-enc-broken.fw
+#lib/firmware/v4l-cx25840.fw
-- 
2.30.2