Takashi Iwai
f84c139643
- Backport upstream fixes: a few fixes for chmap support, alsaconf updates, a new monitor command for alsactl, etc: 0006-amixer-fix-indentation-when-printing-container-TLV-c.patch 0007-alsaloop-pcmjob.c-use-portable-way-to-initialize-rec.patch 0008-speaker-test-Fix-chmapped-channel-selection-without-.patch 0009-speaker-test-Always-show-chmap-channel-names-if-avai.patch 0010-speaker-test-Show-out-of-chmap-channels-as-Unknown.patch 0011-alsaconf-support-newer-m-i-t-and-kmod.patch 0012-alsaconf-update-gentoo-to-use-modprobe.d-method-as-e.patch 0013-configure-detect-udevdir-via-pkg-config-fallback-to-.patch 0014-alsactl-Add-monitor-command.patch 0015-alsactl-Fix-REMOVE-event-handling-in-monitor-command.patch 0016-alsactl-monitor-all-cards-as-default.patch OBS-URL: https://build.opensuse.org/request/show/208681 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=94
33 lines
943 B
Diff
33 lines
943 B
Diff
From 54a459a884ea7e8fe7f80ed9bf84b0417205c5d4 Mon Sep 17 00:00:00 2001
|
|
From: Mike Frysinger <vapier@gentoo.org>
|
|
Date: Wed, 13 Nov 2013 13:23:48 -0500
|
|
Subject: [PATCH] alsaconf: update gentoo to use modprobe.d method as everyone
|
|
else
|
|
|
|
We migrated off modules.d a long time ago.
|
|
|
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
alsaconf/alsaconf.in | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
|
|
index 59f25d1ee1d9..3d6adca8b0bd 100644
|
|
--- a/alsaconf/alsaconf.in
|
|
+++ b/alsaconf/alsaconf.in
|
|
@@ -300,9 +300,7 @@ if [ -n "$cfgfile" ]; then
|
|
exit 1
|
|
fi
|
|
else
|
|
-if [ "$distribution" = "gentoo" ]; then
|
|
- cfgfile="/etc/modules.d/alsa"
|
|
-elif [ "$kernel" = "new" ]; then
|
|
+if [ "$kernel" = "new" ]; then
|
|
cfgfile="/etc/modprobe.conf"
|
|
if [ -d /etc/modprobe.d ]; then
|
|
cfgout="/etc/modprobe.d/50-sound.conf"
|
|
--
|
|
1.8.4.3
|
|
|