From patchwork Mon May 8 17:07:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6845 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QFSQc6BRMz3wlc for ; Mon, 8 May 2023 17:07:36 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QFSQV1Y0Tz1TN; Mon, 8 May 2023 17:07:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QFSQV0NR7z2yqB; Mon, 8 May 2023 17:07:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QFSQS5dMLz2xlq for ; Mon, 8 May 2023 17:07:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4QFSQS2dhPzGy; Mon, 8 May 2023 17:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683565648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SlZ9NiA2H+uleHakXzwUgUo5wSJcBSN2XmtNnEnEUr0=; b=H536GVHSe8aNyCLutvS9q5HfBnZ2ivJrrDRX46r/5FZuzzSo35s6A/mFgcdV/tTQuV/GMB OJ+7Zjp3ROFGF/hzuzv0afRrIvtfsfvSruK+zbJpuC6hfJGD6ZwH/+4ddXVxDIfR+EKHaE HJt5DfWKqTw/DvXgX6tM4BXSKGbPAD4SFJl3Z9HcHrB2vGRirXT3WigaMgrfwSC1NUGVtO vTA6USHw2LPhdx2vlfIi4mAFiQjC2n4TyMzF4l0e6eKxSlp4hZPJpD8mqISrbUdm/5S1kT +gFcuhBhXLqbYgkls0knTThRtgOgaEGyYIHqLMXHg3CFXf2yBdi9O+zKF29DYQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683565648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SlZ9NiA2H+uleHakXzwUgUo5wSJcBSN2XmtNnEnEUr0=; b=4pGPAJ+BNgz78eBmX0/YVrjr/O2Yz6/fXwA3CpNH7pqTTiVV3IkU7Y+8BDXZeO3s4mpyrn T5gZ0SfEBI6cG0Bw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v2 4/4] alsa: Uncomment the conf file names in the rootfile Date: Mon, 8 May 2023 19:07:23 +0200 Message-Id: <20230508170723.3525876-4-adolf.belka@ipfire.org> In-Reply-To: <20230508170723.3525876-1-adolf.belka@ipfire.org> References: <20230508170723.3525876-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Based on input from Arne Fitzenreiter there are conf files that alsa complains about if they are not present. This patch uncomments all the default conf files - The backup include file is also added to the rootfile. Suggested-by: Arne Fitzenreiter Signed-off-by: Adolf Belka --- config/rootfiles/packages/alsa | 187 +++++++++++++++++---------------- 1 file changed, 94 insertions(+), 93 deletions(-) diff --git a/config/rootfiles/packages/alsa b/config/rootfiles/packages/alsa index 987e7f372..bce2ff5cc 100644 --- a/config/rootfiles/packages/alsa +++ b/config/rootfiles/packages/alsa @@ -197,7 +197,7 @@ usr/local/share/alsa #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/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 @@ -215,13 +215,13 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #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/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 @@ -233,15 +233,15 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #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.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.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.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 @@ -255,10 +255,10 @@ usr/local/share/alsa/firmware/hdsploader/rpm_firmware.bin #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/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 @@ -269,69 +269,69 @@ usr/sbin/alsaconf usr/sbin/alsactl #usr/share/aclocal/alsa.m4 usr/share/alsa -#usr/share/alsa/alsa.conf +usr/share/alsa/alsa.conf #usr/share/alsa/cards -#usr/share/alsa/cards/AACI.conf -#usr/share/alsa/cards/ATIIXP-MODEM.conf -#usr/share/alsa/cards/ATIIXP-SPDMA.conf -#usr/share/alsa/cards/ATIIXP.conf -#usr/share/alsa/cards/AU8810.conf -#usr/share/alsa/cards/AU8820.conf -#usr/share/alsa/cards/AU8830.conf -#usr/share/alsa/cards/Audigy.conf -#usr/share/alsa/cards/Audigy2.conf -#usr/share/alsa/cards/Aureon51.conf -#usr/share/alsa/cards/Aureon71.conf -#usr/share/alsa/cards/CA0106.conf -#usr/share/alsa/cards/CMI8338-SWIEC.conf -#usr/share/alsa/cards/CMI8338.conf -#usr/share/alsa/cards/CMI8738-MC6.conf -#usr/share/alsa/cards/CMI8738-MC8.conf -#usr/share/alsa/cards/CMI8788.conf -#usr/share/alsa/cards/CS46xx.conf -#usr/share/alsa/cards/EMU10K1.conf -#usr/share/alsa/cards/EMU10K1X.conf -#usr/share/alsa/cards/ENS1370.conf -#usr/share/alsa/cards/ENS1371.conf -#usr/share/alsa/cards/ES1968.conf -#usr/share/alsa/cards/Echo_Echo3G.conf -#usr/share/alsa/cards/FM801.conf -#usr/share/alsa/cards/FWSpeakers.conf -#usr/share/alsa/cards/FireWave.conf -#usr/share/alsa/cards/GUS.conf -#usr/share/alsa/cards/HDA-Intel.conf -#usr/share/alsa/cards/HdmiLpeAudio.conf -#usr/share/alsa/cards/ICE1712.conf -#usr/share/alsa/cards/ICE1724.conf -#usr/share/alsa/cards/ICH-MODEM.conf -#usr/share/alsa/cards/ICH.conf -#usr/share/alsa/cards/ICH4.conf -#usr/share/alsa/cards/Loopback.conf -#usr/share/alsa/cards/Maestro3.conf -#usr/share/alsa/cards/NFORCE.conf -#usr/share/alsa/cards/PC-Speaker.conf -#usr/share/alsa/cards/PMac.conf -#usr/share/alsa/cards/PMacToonie.conf -#usr/share/alsa/cards/PS3.conf -#usr/share/alsa/cards/RME9636.conf -#usr/share/alsa/cards/RME9652.conf -#usr/share/alsa/cards/SB-XFi.conf -#usr/share/alsa/cards/SI7018.conf -#usr/share/alsa/cards/TRID4DWAVENX.conf -#usr/share/alsa/cards/USB-Audio.conf -#usr/share/alsa/cards/VIA686A.conf -#usr/share/alsa/cards/VIA8233.conf -#usr/share/alsa/cards/VIA8233A.conf -#usr/share/alsa/cards/VIA8237.conf -#usr/share/alsa/cards/VX222.conf -#usr/share/alsa/cards/VXPocket.conf -#usr/share/alsa/cards/VXPocket440.conf -#usr/share/alsa/cards/YMF744.conf -#usr/share/alsa/cards/aliases.conf -#usr/share/alsa/cards/pistachio-card.conf -#usr/share/alsa/cards/vc4-hdmi.conf +usr/share/alsa/cards/AACI.conf +usr/share/alsa/cards/ATIIXP-MODEM.conf +usr/share/alsa/cards/ATIIXP-SPDMA.conf +usr/share/alsa/cards/ATIIXP.conf +usr/share/alsa/cards/AU8810.conf +usr/share/alsa/cards/AU8820.conf +usr/share/alsa/cards/AU8830.conf +usr/share/alsa/cards/Audigy.conf +usr/share/alsa/cards/Audigy2.conf +usr/share/alsa/cards/Aureon51.conf +usr/share/alsa/cards/Aureon71.conf +usr/share/alsa/cards/CA0106.conf +usr/share/alsa/cards/CMI8338-SWIEC.conf +usr/share/alsa/cards/CMI8338.conf +usr/share/alsa/cards/CMI8738-MC6.conf +usr/share/alsa/cards/CMI8738-MC8.conf +usr/share/alsa/cards/CMI8788.conf +usr/share/alsa/cards/CS46xx.conf +usr/share/alsa/cards/EMU10K1.conf +usr/share/alsa/cards/EMU10K1X.conf +usr/share/alsa/cards/ENS1370.conf +usr/share/alsa/cards/ENS1371.conf +usr/share/alsa/cards/ES1968.conf +usr/share/alsa/cards/Echo_Echo3G.conf +usr/share/alsa/cards/FM801.conf +usr/share/alsa/cards/FWSpeakers.conf +usr/share/alsa/cards/FireWave.conf +usr/share/alsa/cards/GUS.conf +usr/share/alsa/cards/HDA-Intel.conf +usr/share/alsa/cards/HdmiLpeAudio.conf +usr/share/alsa/cards/ICE1712.conf +usr/share/alsa/cards/ICE1724.conf +usr/share/alsa/cards/ICH-MODEM.conf +usr/share/alsa/cards/ICH.conf +usr/share/alsa/cards/ICH4.conf +usr/share/alsa/cards/Loopback.conf +usr/share/alsa/cards/Maestro3.conf +usr/share/alsa/cards/NFORCE.conf +usr/share/alsa/cards/PC-Speaker.conf +usr/share/alsa/cards/PMac.conf +usr/share/alsa/cards/PMacToonie.conf +usr/share/alsa/cards/PS3.conf +usr/share/alsa/cards/RME9636.conf +usr/share/alsa/cards/RME9652.conf +usr/share/alsa/cards/SB-XFi.conf +usr/share/alsa/cards/SI7018.conf +usr/share/alsa/cards/TRID4DWAVENX.conf +usr/share/alsa/cards/USB-Audio.conf +usr/share/alsa/cards/VIA686A.conf +usr/share/alsa/cards/VIA8233.conf +usr/share/alsa/cards/VIA8233A.conf +usr/share/alsa/cards/VIA8237.conf +usr/share/alsa/cards/VX222.conf +usr/share/alsa/cards/VXPocket.conf +usr/share/alsa/cards/VXPocket440.conf +usr/share/alsa/cards/YMF744.conf +usr/share/alsa/cards/aliases.conf +usr/share/alsa/cards/pistachio-card.conf +usr/share/alsa/cards/vc4-hdmi.conf #usr/share/alsa/ctl -#usr/share/alsa/ctl/default.conf +usr/share/alsa/ctl/default.conf #usr/share/alsa/init #usr/share/alsa/init/00main #usr/share/alsa/init/ca0106 @@ -341,23 +341,23 @@ usr/share/alsa #usr/share/alsa/init/info #usr/share/alsa/init/test #usr/share/alsa/pcm -#usr/share/alsa/pcm/center_lfe.conf -#usr/share/alsa/pcm/default.conf -#usr/share/alsa/pcm/dmix.conf -#usr/share/alsa/pcm/dpl.conf -#usr/share/alsa/pcm/dsnoop.conf -#usr/share/alsa/pcm/front.conf -#usr/share/alsa/pcm/hdmi.conf -#usr/share/alsa/pcm/iec958.conf -#usr/share/alsa/pcm/modem.conf -#usr/share/alsa/pcm/rear.conf -#usr/share/alsa/pcm/side.conf -#usr/share/alsa/pcm/surround21.conf -#usr/share/alsa/pcm/surround40.conf -#usr/share/alsa/pcm/surround41.conf -#usr/share/alsa/pcm/surround50.conf -#usr/share/alsa/pcm/surround51.conf -#usr/share/alsa/pcm/surround71.conf +usr/share/alsa/pcm/center_lfe.conf +usr/share/alsa/pcm/default.conf +usr/share/alsa/pcm/dmix.conf +usr/share/alsa/pcm/dpl.conf +usr/share/alsa/pcm/dsnoop.conf +usr/share/alsa/pcm/front.conf +usr/share/alsa/pcm/hdmi.conf +usr/share/alsa/pcm/iec958.conf +usr/share/alsa/pcm/modem.conf +usr/share/alsa/pcm/rear.conf +usr/share/alsa/pcm/side.conf +usr/share/alsa/pcm/surround21.conf +usr/share/alsa/pcm/surround40.conf +usr/share/alsa/pcm/surround41.conf +usr/share/alsa/pcm/surround50.conf +usr/share/alsa/pcm/surround51.conf +usr/share/alsa/pcm/surround71.conf #usr/share/locale/de/LC_MESSAGES/alsa-utils.mo #usr/share/locale/eu/LC_MESSAGES/alsa-utils.mo #usr/share/locale/fr/LC_MESSAGES/alsa-utils.mo @@ -397,4 +397,5 @@ usr/share/sounds/alsa #usr/share/sounds/alsa/Rear_Right.wav #usr/share/sounds/alsa/Side_Left.wav #usr/share/sounds/alsa/Side_Right.wav +var/ipfire/backup/addons/includes/alsa var/lib/alsa