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 0348f6b23f98b2e6109241b0d97424a676cde560 (commit) via d3b2b04672209aa5971e69d99c4fa64da875a370 (commit) via 6c85ffbfd45a3c2f23e6b8f512c40cf9b0678d86 (commit) via cb58d049e0e121466fb2eb0694fa7b8e715b6f2c (commit) via 8064dce996a356e228be5fdd900a6733df3f47b7 (commit) via 1513ac881469b8ecf6421d589f4aca1d0130c86c (commit) via 71070690da3fa83c1f948c2c577cb9e171078da9 (commit) via 633c7318279d99e98e8cdf077c4f3ab922744212 (commit) via d7d963ed862b2c607dbb43a037f24c075896e378 (commit) via 3931b56d765904ba0a1ef2b857f861374f9d53f9 (commit) via 19471f2951ae48e28a3ab331d4d370488a371dba (commit) via 84f8640da0f2550a9b2a35299a0dd5d7059c4d19 (commit) via ece94c7edfa45b724ef05b57ff7a8a18c43fb99b (commit) from 010869713142e1cc8874e59409e446a075a2878d (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 0348f6b23f98b2e6109241b0d97424a676cde560 Merge: 010869713 d3b2b0467 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Dec 19 17:55:21 2023 +0100
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/oldcore/182/update.sh | 9 +- config/rootfiles/packages/alsa | 166 ++++++++++++++++----------------- lfs/alsa | 2 +- src/initscripts/packages/alsa | 8 +- src/paks/alsa/uninstall.sh | 3 - 5 files changed, 89 insertions(+), 99 deletions(-)
Difference in files: diff --git a/config/rootfiles/oldcore/182/update.sh b/config/rootfiles/oldcore/182/update.sh index dc961f1e3..e906a8c60 100644 --- a/config/rootfiles/oldcore/182/update.sh +++ b/config/rootfiles/oldcore/182/update.sh @@ -54,19 +54,12 @@ rm -rvf \ /lib/firmware/cxgb4/t6fw-1.27.3* \ /lib/firmware/ctefx.bin \ /lib/firmware/ctspeq.bin \ - /lib/firmware/ess \ /lib/firmware/intel/ibt-* \ - /lib/firmware/korg \ /lib/firmware/mediatek/BT_RAM_CODE_* \ /lib/firmware/nxp \ - /lib/firmware/sb16 \ - /lib/firmware/yamaha \ /lib/udev/rules.d/64-xfs.rules \ /usr/bin/gawk-5.2* \ - /usr/lib/grub/{arm64-efi,i386-pc,riscv64-efi,x86_64-efi}/gmodule.pl \ - /usr/lib/liblzma.so.5.4* \ - /usr/lib/libqpdf.so.29.5* \ - /usr/lib/libsodium.so.23* + /usr/lib/grub/{arm64-efi,i386-pc,riscv64-efi,x86_64-efi}/gmodule.pl
# update linker config ldconfig diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index a18368e4a..a04de0db4 100644 --- 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 a0a517ed8..55b4f7152 100644 --- 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 = 20
DEPS =
diff --git a/src/initscripts/packages/alsa b/src/initscripts/packages/alsa index 348e33846..8c0a2cbd2 100644 --- a/src/initscripts/packages/alsa +++ b/src/initscripts/packages/alsa @@ -24,12 +24,12 @@
case "$1" in start) + modprobe snd_pcm_oss >/dev/null 2>&1 + modprobe snd_mixer_oss >/dev/null 2>&1 boot_mesg "Starting ALSA... Restoring volumes..." - modprobe snd_pcm_oss >/dev/null 2>&1 || failed=1 - modprobe snd_mixer_oss >/dev/null 2>&1 || failed=1 - (exit ${failed}) - evaluate_retval loadproc /usr/sbin/alsactl restore + evaluate_retval + exit 0 ;; stop) boot_mesg "Stopping ALSA... Saving volumes..." diff --git a/src/paks/alsa/uninstall.sh b/src/paks/alsa/uninstall.sh index ce88c294b..a02e2bbf9 100644 --- a/src/paks/alsa/uninstall.sh +++ b/src/paks/alsa/uninstall.sh @@ -24,9 +24,6 @@ . /opt/pakfire/lib/functions.sh stop_service ${NAME} make_backup ${NAME} -# unload alsa related modules -modprobe -r snd_pcm_oss >/dev/null 2>&1 || failed=1 -modprobe -r snd_timer >/dev/null 2>&1 || failed=1 remove_files rm -rf /etc/rc.d/rc*.d/*alsa exit 0
hooks/post-receive -- IPFire 2.x development tree