[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f5b6a32ee2b81acbbfdb9e8a72cdb8f96f5e38e1

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f5b6a32ee2b81acbbfdb9e8a72cdb8f96f5e38e1

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  f5b6a32ee2b81acbbfdb9e8a72cdb8f96f5e38e1 (commit)
       via  b35d101fe802efa01677031336fe49448bfd1dcb (commit)
       via  6a6a8deb721e299f539bc0a4b3b091a8c11e2762 (commit)
      from  2ce296c882984020cb669710cd3bcbcee1e0cdc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f5b6a32ee2b81acbbfdb9e8a72cdb8f96f5e38e1
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Mar 10 21:06:57 2025 +0000

    lm-sensors: Update rootfile
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit b35d101fe802efa01677031336fe49448bfd1dcb
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Mar 10 21:04:25 2025 +0000

    linux-firmware: Update rootfile
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

commit 6a6a8deb721e299f539bc0a4b3b091a8c11e2762
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Mar 10 21:03:08 2025 +0000

    alsa: Drop firmware
    
    This caused the build to break.
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/common/aarch64/lm_sensors |   1 +
 config/rootfiles/common/linux-firmware     |   1 -
 config/rootfiles/common/x86_64/lm_sensors  |   1 +
 config/rootfiles/packages/alsa             | 199 -----------------------------
 lfs/alsa                                   |  11 +-
 5 files changed, 4 insertions(+), 209 deletions(-)

Difference in files:
diff --git a/config/rootfiles/common/aarch64/lm_sensors b/config/rootfiles/common/aarch64/lm_sensors
index f10ad80bd..bb4efdb89 100644
--- a/config/rootfiles/common/aarch64/lm_sensors
+++ b/config/rootfiles/common/aarch64/lm_sensors
@@ -10,6 +10,7 @@ usr/bin/sensors-conf-convert
 usr/lib/libsensors.so.5
 usr/lib/libsensors.so.5.0.0
 #usr/man/man1/sensors.1
+#usr/man/man3
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
 #usr/man/man5/sensors3.conf.5
diff --git a/config/rootfiles/common/linux-firmware b/config/rootfiles/common/linux-firmware
index 4a94578cf..66c883f41 100644
--- a/config/rootfiles/common/linux-firmware
+++ b/config/rootfiles/common/linux-firmware
@@ -1096,7 +1096,6 @@ lib/firmware/bnx2x/bnx2x-e2-7.13.1.0.fw
 lib/firmware/bnx2x/bnx2x-e2-7.13.11.0.fw
 lib/firmware/bnx2x/bnx2x-e2-7.13.15.0.fw
 lib/firmware/bnx2x/bnx2x-e2-7.13.21.0.fw
-lib/firmware/brcm
 lib/firmware/brcm/BCM-0a5c-6410.hcd
 lib/firmware/brcm/BCM-0bb4-0306.hcd
 lib/firmware/brcm/bcm4329-fullmac-4.bin
diff --git a/config/rootfiles/common/x86_64/lm_sensors b/config/rootfiles/common/x86_64/lm_sensors
index 0f7461d4c..9b6c0f0f0 100644
--- a/config/rootfiles/common/x86_64/lm_sensors
+++ b/config/rootfiles/common/x86_64/lm_sensors
@@ -10,6 +10,7 @@ usr/lib/libsensors.so
 usr/lib/libsensors.so.5
 usr/lib/libsensors.so.5.0.0
 #usr/man/man1/sensors.1
+#usr/man/man3
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
 #usr/man/man5/sensors3.conf.5
diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa
index 9f11c309d..f61fd8fdd 100644
--- a/config/rootfiles/packages/alsa
+++ b/config/rootfiles/packages/alsa
@@ -1,128 +1,4 @@
 etc/rc.d/init.d/alsa
-lib/firmware/aica_firmware.bin
-#lib/firmware/asihpi
-lib/firmware/asihpi/dsp5000.bin
-lib/firmware/asihpi/dsp6200.bin
-lib/firmware/asihpi/dsp6205.bin
-lib/firmware/asihpi/dsp6400.bin
-lib/firmware/asihpi/dsp6600.bin
-lib/firmware/asihpi/dsp8700.bin
-lib/firmware/asihpi/dsp8900.bin
-#lib/firmware/cs46xx
-lib/firmware/cs46xx/ba1
-lib/firmware/cs46xx/cwc4630
-lib/firmware/cs46xx/cwcasync
-lib/firmware/cs46xx/cwcbinhack
-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
-lib/firmware/ea/3g_asic.fw
-lib/firmware/ea/darla20_dsp.fw
-lib/firmware/ea/darla24_dsp.fw
-lib/firmware/ea/echo3g_dsp.fw
-lib/firmware/ea/gina20_dsp.fw
-lib/firmware/ea/gina24_301_asic.fw
-lib/firmware/ea/gina24_301_dsp.fw
-lib/firmware/ea/gina24_361_asic.fw
-lib/firmware/ea/gina24_361_dsp.fw
-lib/firmware/ea/indigo_dj_dsp.fw
-lib/firmware/ea/indigo_djx_dsp.fw
-lib/firmware/ea/indigo_dsp.fw
-lib/firmware/ea/indigo_io_dsp.fw
-lib/firmware/ea/indigo_iox_dsp.fw
-lib/firmware/ea/layla20_asic.fw
-lib/firmware/ea/layla20_dsp.fw
-lib/firmware/ea/layla24_1_asic.fw
-lib/firmware/ea/layla24_2A_asic.fw
-lib/firmware/ea/layla24_2S_asic.fw
-lib/firmware/ea/layla24_dsp.fw
-lib/firmware/ea/loader_dsp.fw
-lib/firmware/ea/mia_dsp.fw
-lib/firmware/ea/mona_2_asic.fw
-lib/firmware/ea/mona_301_1_asic_48.fw
-lib/firmware/ea/mona_301_1_asic_96.fw
-lib/firmware/ea/mona_301_dsp.fw
-lib/firmware/ea/mona_361_1_asic_48.fw
-lib/firmware/ea/mona_361_1_asic_96.fw
-lib/firmware/ea/mona_361_dsp.fw
-#lib/firmware/emu
-lib/firmware/emu/audio_dock.fw
-lib/firmware/emu/emu0404.fw
-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
-lib/firmware/ess/maestro3_assp_kernel.fw
-lib/firmware/ess/maestro3_assp_minisrc.fw
-#lib/firmware/korg
-lib/firmware/korg/k1212.dsp
-#lib/firmware/mixart
-lib/firmware/mixart/miXart8.elf
-lib/firmware/mixart/miXart8.xlx
-lib/firmware/mixart/miXart8AES.xlx
-lib/firmware/multiface_firmware.bin
-lib/firmware/multiface_firmware_rev11.bin
-#lib/firmware/pcxhr
-lib/firmware/pcxhr/b321_512.b56
-lib/firmware/pcxhr/d321_512.d56
-lib/firmware/pcxhr/dspb1222e.b56
-lib/firmware/pcxhr/dspb1222hr.b56
-lib/firmware/pcxhr/dspb882e.b56
-lib/firmware/pcxhr/dspb882hr.b56
-lib/firmware/pcxhr/dspb924.b56
-lib/firmware/pcxhr/dspd1222.d56
-lib/firmware/pcxhr/dspd222.d56
-lib/firmware/pcxhr/dspd882.d56
-lib/firmware/pcxhr/dspe882.e56
-lib/firmware/pcxhr/dspe924.e56
-lib/firmware/pcxhr/e321_512.e56
-lib/firmware/pcxhr/xc_1_882.dat
-lib/firmware/pcxhr/xi_1_882.dat
-lib/firmware/pcxhr/xlxc1222e.dat
-lib/firmware/pcxhr/xlxc1222hr.dat
-lib/firmware/pcxhr/xlxc222.dat
-lib/firmware/pcxhr/xlxc882e.dat
-lib/firmware/pcxhr/xlxc882hr.dat
-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/turtlebeach
-lib/firmware/turtlebeach/msndinit.bin
-lib/firmware/turtlebeach/msndperm.bin
-lib/firmware/turtlebeach/pndsperm.bin
-lib/firmware/turtlebeach/pndspini.bin
-#lib/firmware/vx
-lib/firmware/vx/bd56002.boot
-lib/firmware/vx/bd563s3.boot
-lib/firmware/vx/bd563v2.boot
-lib/firmware/vx/bx_1_vp4.b56
-lib/firmware/vx/bx_1_vxp.b56
-lib/firmware/vx/l_1_v22.d56
-lib/firmware/vx/l_1_vp4.d56
-lib/firmware/vx/l_1_vx2.d56
-lib/firmware/vx/l_1_vxp.d56
-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
-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
@@ -212,81 +88,6 @@ usr/lib/libatopology.so.2
 usr/lib/libatopology.so.2.0.0
 #usr/lib/pkgconfig/alsa-topology.pc
 #usr/lib/pkgconfig/alsa.pc
-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/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/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/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/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/sbin/alsa-info.sh
 usr/sbin/alsabat-test.sh
 usr/sbin/alsaconf
diff --git a/lfs/alsa b/lfs/alsa
index 6a63d6d88..18a7868b9 100644
--- a/lfs/alsa
+++ b/lfs/alsa
@@ -29,14 +29,13 @@ SUMMARY    = Advanced Linux Sound Architecture
 VER        = 1.2.13
 UVER       = 1.2.13
 CVER       = 1.2.13
-FVER       = 1.2.4
 
 THISAPP    = alsa-lib-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = alsa
-PAK_VER    = 21
+PAK_VER    = 22
 
 DEPS       =
 
@@ -48,17 +47,15 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) alsa-utils-$(UVER).tar.bz2 alsa-firmware-$(FVER).tar.bz2 alsa-ucm-conf-$(CVER).tar.bz2
+objects = $(DL_FILE) alsa-utils-$(UVER).tar.bz2 alsa-ucm-conf-$(CVER).tar.bz2
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 alsa-utils-$(UVER).tar.bz2 = $(DL_FROM)/alsa-utils-$(UVER).tar.bz2
-alsa-firmware-$(FVER).tar.bz2 = $(DL_FROM)/alsa-firmware-$(FVER).tar.bz2
 alsa-ucm-conf-$(CVER).tar.bz2 = $(DL_FROM)/alsa-ucm-conf-$(CVER).tar.bz2
 
 $(DL_FILE)_BLAKE2 = 1723ca5f191525e050f05423fb9ccf4501e4f20490d01b0c068493bbce279d3a067e8d0e5f52f9c76c2eaecb4c2b3fc42690193b88c313461fce2aec390175b3
 alsa-utils-$(UVER).tar.bz2_BLAKE2 = 9bc2bf8e21fb9308c2eabc6612da0848f9ddba45acb8bf8453d9cff7f73fa0267495430a150ea53b28fab8afb69a51e487e8b253dc7501e17d77ea3f6e90bcf7
-alsa-firmware-$(FVER).tar.bz2_BLAKE2 = 0f844f6cc4859b72635f24d347b4c790469aee39aa60d9addb2c168dcf06b48e7e3cbba26ff21c7e1f5aa355641eec7ab934cb09bfac8ca116a6ac6a7db9d548
 alsa-ucm-conf-$(CVER).tar.bz2_BLAKE2 = 87e4bf2285961e316ca853e9245e02447ea9e60fa506e124c072e2b6ed71345fc0c30b19bf8c849f8123a6b95a4facd22225eafccba8164266961110a60ef44c
 
 install : $(TARGET)
@@ -94,7 +91,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_SRC)/alsa*
 	cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && tar xfj $(DIR_DL)/alsa-utils-$(UVER).tar.bz2
-	cd $(DIR_APP) && tar xfj $(DIR_DL)/alsa-firmware-$(FVER).tar.bz2
 	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
@@ -102,9 +98,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/alsa-utils-$(UVER) && ./configure --disable-xmlto
 	cd $(DIR_APP)/alsa-utils-$(UVER) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP)/alsa-utils-$(UVER) && make install
-	cd $(DIR_APP)/alsa-firmware-$(FVER) && ./configure
-	cd $(DIR_APP)/alsa-firmware-$(FVER) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP)/alsa-firmware-$(FVER) && make install
 	cd $(DIR_APP) && tar xfj $(DIR_DL)/alsa-ucm-conf-$(CVER).tar.bz2 \
 		-C /usr/share/alsa --strip-components=1 --wildcards "*/ucm2"
 	# install initscript


hooks/post-receive
--
IPFire 2.x development tree