alsa: update rootfile and bump version

some files are removed from linux-firmware so we need
to install alsa again.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa
index a18368e4a53618d11cb70d3f48cf8596cd2723d9..a04de0db493025f9fc8ef2b4b32e5f35c5eab0c8 100644 (file)
--- a/config/rootfiles/packages/alsa
+++ b/config/rootfiles/packages/alsa
@@ -17,8 +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/ctefx.bin
+lib/firmware/ctspeq.bin
 lib/firmware/digiface_firmware.bin
 lib/firmware/digiface_firmware_rev11.bin
 #lib/firmware/ea
@@ -59,10 +59,10 @@ lib/firmware/emu/emu1010b.fw
 lib/firmware/emu/hana.fw
 lib/firmware/emu/micro_dock.fw
 #lib/firmware/ess
-#lib/firmware/ess/maestro3_assp_kernel.fw
-#lib/firmware/ess/maestro3_assp_minisrc.fw
+lib/firmware/ess/maestro3_assp_kernel.fw
+lib/firmware/ess/maestro3_assp_minisrc.fw
 #lib/firmware/korg
-#lib/firmware/korg/k1212.dsp
+lib/firmware/korg/k1212.dsp
 #lib/firmware/mixart
 lib/firmware/mixart/miXart8.elf
 lib/firmware/mixart/miXart8.xlx
@@ -94,11 +94,11 @@ lib/firmware/pcxhr/xlxc924.dat
 lib/firmware/pcxhr/xlxint.dat
 lib/firmware/rpm_firmware.bin
 #lib/firmware/sb16
-#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/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
@@ -119,11 +119,11 @@ lib/firmware/vx/x1_1_vx2.xlx
 lib/firmware/vx/x1_1_vxp.xlx
 lib/firmware/vx/x1_2_v22.xlx
 #lib/firmware/yamaha
-#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
+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
 usr/bin/alsaloop
@@ -212,78 +212,78 @@ usr/lib/libatopology.so.2.0.0
 usr/local/share/alsa
 #usr/local/share/alsa/firmware
 #usr/local/share/alsa/firmware/hdsploader
-#usr/local/share/alsa/firmware/hdsploader/digiface_firmware.bin
-#usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin
-#usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin
-#usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin
-#usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin
+usr/local/share/alsa/firmware/hdsploader/digiface_firmware.bin
+usr/local/share/alsa/firmware/hdsploader/digiface_firmware_rev11.bin
+usr/local/share/alsa/firmware/hdsploader/multiface_firmware.bin
+usr/local/share/alsa/firmware/hdsploader/multiface_firmware_rev11.bin
+usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin
 #usr/local/share/alsa/firmware/mixartloader
-#usr/local/share/alsa/firmware/mixartloader/miXart.conf
-#usr/local/share/alsa/firmware/mixartloader/miXart8.elf
-#usr/local/share/alsa/firmware/mixartloader/miXart8.xlx
-#usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
+usr/local/share/alsa/firmware/mixartloader/miXart.conf
+usr/local/share/alsa/firmware/mixartloader/miXart8.elf
+usr/local/share/alsa/firmware/mixartloader/miXart8.xlx
+usr/local/share/alsa/firmware/mixartloader/miXart8AES.xlx
 #usr/local/share/alsa/firmware/pcxhrloader
-#usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56
-#usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56
-#usr/local/share/alsa/firmware/pcxhrloader/dspb1222e.b56
-#usr/local/share/alsa/firmware/pcxhrloader/dspb1222hr.b56
-#usr/local/share/alsa/firmware/pcxhrloader/dspb882e.b56
-#usr/local/share/alsa/firmware/pcxhrloader/dspb882hr.b56
-#usr/local/share/alsa/firmware/pcxhrloader/dspb924.b56
-#usr/local/share/alsa/firmware/pcxhrloader/dspd1222.d56
-#usr/local/share/alsa/firmware/pcxhrloader/dspd222.d56
-#usr/local/share/alsa/firmware/pcxhrloader/dspd882.d56
-#usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56
-#usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56
-#usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf
-#usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf
-#usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat
-#usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat
-#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat
-#usr/local/share/alsa/firmware/pcxhrloader/xlxc1222hr.dat
-#usr/local/share/alsa/firmware/pcxhrloader/xlxc222.dat
-#usr/local/share/alsa/firmware/pcxhrloader/xlxc882e.dat
-#usr/local/share/alsa/firmware/pcxhrloader/xlxc882hr.dat
-#usr/local/share/alsa/firmware/pcxhrloader/xlxc924.dat
-#usr/local/share/alsa/firmware/pcxhrloader/xlxint.dat
+usr/local/share/alsa/firmware/pcxhrloader/b321_512.b56
+usr/local/share/alsa/firmware/pcxhrloader/d321_512.d56
+usr/local/share/alsa/firmware/pcxhrloader/dspb1222e.b56
+usr/local/share/alsa/firmware/pcxhrloader/dspb1222hr.b56
+usr/local/share/alsa/firmware/pcxhrloader/dspb882e.b56
+usr/local/share/alsa/firmware/pcxhrloader/dspb882hr.b56
+usr/local/share/alsa/firmware/pcxhrloader/dspb924.b56
+usr/local/share/alsa/firmware/pcxhrloader/dspd1222.d56
+usr/local/share/alsa/firmware/pcxhrloader/dspd222.d56
+usr/local/share/alsa/firmware/pcxhrloader/dspd882.d56
+usr/local/share/alsa/firmware/pcxhrloader/dspe882.e56
+usr/local/share/alsa/firmware/pcxhrloader/dspe924.e56
+usr/local/share/alsa/firmware/pcxhrloader/e321_512.e56
+usr/local/share/alsa/firmware/pcxhrloader/pcxhr.conf
+usr/local/share/alsa/firmware/pcxhrloader/pcxhr0.conf
+usr/local/share/alsa/firmware/pcxhrloader/pcxhr1.conf
+usr/local/share/alsa/firmware/pcxhrloader/pcxhr2.conf
+usr/local/share/alsa/firmware/pcxhrloader/pcxhr3.conf
+usr/local/share/alsa/firmware/pcxhrloader/pcxhr4.conf
+usr/local/share/alsa/firmware/pcxhrloader/pcxhr5.conf
+usr/local/share/alsa/firmware/pcxhrloader/xc_1_882.dat
+usr/local/share/alsa/firmware/pcxhrloader/xi_1_882.dat
+usr/local/share/alsa/firmware/pcxhrloader/xlxc1222e.dat
+usr/local/share/alsa/firmware/pcxhrloader/xlxc1222hr.dat
+usr/local/share/alsa/firmware/pcxhrloader/xlxc222.dat
+usr/local/share/alsa/firmware/pcxhrloader/xlxc882e.dat
+usr/local/share/alsa/firmware/pcxhrloader/xlxc882hr.dat
+usr/local/share/alsa/firmware/pcxhrloader/xlxc924.dat
+usr/local/share/alsa/firmware/pcxhrloader/xlxint.dat
 #usr/local/share/alsa/firmware/usx2yloader
-#usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx
-#usr/local/share/alsa/firmware/usx2yloader/us122.conf
-#usr/local/share/alsa/firmware/usx2yloader/us122.prepad
-#usr/local/share/alsa/firmware/usx2yloader/us122.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
-#usr/local/share/alsa/firmware/usx2yloader/us224.conf
-#usr/local/share/alsa/firmware/usx2yloader/us224.prepad
-#usr/local/share/alsa/firmware/usx2yloader/us224.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
-#usr/local/share/alsa/firmware/usx2yloader/us428.conf
-#usr/local/share/alsa/firmware/usx2yloader/us428.prepad
-#usr/local/share/alsa/firmware/usx2yloader/us428.rbt
-#usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
+usr/local/share/alsa/firmware/usx2yloader/tascam_loader.ihx
+usr/local/share/alsa/firmware/usx2yloader/us122.conf
+usr/local/share/alsa/firmware/usx2yloader/us122.prepad
+usr/local/share/alsa/firmware/usx2yloader/us122.rbt
+usr/local/share/alsa/firmware/usx2yloader/us122fw.ihx
+usr/local/share/alsa/firmware/usx2yloader/us224.conf
+usr/local/share/alsa/firmware/usx2yloader/us224.prepad
+usr/local/share/alsa/firmware/usx2yloader/us224.rbt
+usr/local/share/alsa/firmware/usx2yloader/us224fw.ihx
+usr/local/share/alsa/firmware/usx2yloader/us428.conf
+usr/local/share/alsa/firmware/usx2yloader/us428.prepad
+usr/local/share/alsa/firmware/usx2yloader/us428.rbt
+usr/local/share/alsa/firmware/usx2yloader/us428fw.ihx
 #usr/local/share/alsa/firmware/vxloader
-#usr/local/share/alsa/firmware/vxloader/bd56002.boot
-#usr/local/share/alsa/firmware/vxloader/bd563s3.boot
-#usr/local/share/alsa/firmware/vxloader/bd563v2.boot
-#usr/local/share/alsa/firmware/vxloader/bx_1_vp4.b56
-#usr/local/share/alsa/firmware/vxloader/bx_1_vxp.b56
-#usr/local/share/alsa/firmware/vxloader/l_1_v22.d56
-#usr/local/share/alsa/firmware/vxloader/l_1_vp4.d56
-#usr/local/share/alsa/firmware/vxloader/l_1_vx2.d56
-#usr/local/share/alsa/firmware/vxloader/l_1_vxp.d56
-#usr/local/share/alsa/firmware/vxloader/vx222.conf
-#usr/local/share/alsa/firmware/vxloader/vxboard.conf
-#usr/local/share/alsa/firmware/vxloader/vxp440.conf
-#usr/local/share/alsa/firmware/vxloader/vxpocket.conf
-#usr/local/share/alsa/firmware/vxloader/x1_1_vp4.rbt
-#usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt
-#usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt
-#usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt
+usr/local/share/alsa/firmware/vxloader/bd56002.boot
+usr/local/share/alsa/firmware/vxloader/bd563s3.boot
+usr/local/share/alsa/firmware/vxloader/bd563v2.boot
+usr/local/share/alsa/firmware/vxloader/bx_1_vp4.b56
+usr/local/share/alsa/firmware/vxloader/bx_1_vxp.b56
+usr/local/share/alsa/firmware/vxloader/l_1_v22.d56
+usr/local/share/alsa/firmware/vxloader/l_1_vp4.d56
+usr/local/share/alsa/firmware/vxloader/l_1_vx2.d56
+usr/local/share/alsa/firmware/vxloader/l_1_vxp.d56
+usr/local/share/alsa/firmware/vxloader/vx222.conf
+usr/local/share/alsa/firmware/vxloader/vxboard.conf
+usr/local/share/alsa/firmware/vxloader/vxp440.conf
+usr/local/share/alsa/firmware/vxloader/vxpocket.conf
+usr/local/share/alsa/firmware/vxloader/x1_1_vp4.rbt
+usr/local/share/alsa/firmware/vxloader/x1_1_vx2.rbt
+usr/local/share/alsa/firmware/vxloader/x1_1_vxp.rbt
+usr/local/share/alsa/firmware/vxloader/x1_2_v22.rbt
 usr/sbin/alsa-info.sh
 usr/sbin/alsabat-test.sh
 usr/sbin/alsaconf

diff --git a/lfs/alsa b/lfs/alsa
index a0a517ed8610236c457efeafbf22aac3706aec24..a2b34f83e79dfb3500c54644181badf1149797de 100644 (file)
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -38,7 +38,7 @@ DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 18
+PAK_VER    = 19
 
 DEPS       =