[PATCH [alsa-utils] 1/2] alsaconf: support newer m-i-t and kmod

[PATCH [alsa-utils] 1/2] alsaconf: support newer m-i-t and kmod

[Mike Frysinger]

The m-i-t package made it up to 3.10 versions before ending, so update
the glob to handle those too.

Most distros are moving on to kmod, so we also want to handle the version
string that package outputs.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 alsaconf/alsaconf.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
index 5c23787..59f25d1 100644
--- a/alsaconf/alsaconf.in
+++ b/alsaconf/alsaconf.in
@@ -308,9 +308,11 @@ elif [ "$kernel" = "new" ]; then
     cfgout="/etc/modprobe.d/50-sound.conf"
     cfgoldout="/etc/modprobe.d/sound"
     if [ ! -f $cfgout ]; then
-	modver=$(modprobe -V | sed -e's/^module-init-tools version //')
-	case "$modver" in
-	3.[789]*)
+	case "$(modprobe -V)" in
+	"module-init-tools version "3.[789]*|\
+	"module-init-tools version "3.1[0-9]*)
+	  ;;
+	"kmod version "*)
 	  ;;
 	*)
 	  cfgout="/etc/modprobe.d/sound"
-- 
1.8.3.2

[PATCH [alsa-utils] 2/2] alsaconf: update gentoo to use modprobe.d method as everyone else

[Mike Frysinger]

We migrated off modules.d a long time ago.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
 alsaconf/alsaconf.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
index 59f25d1..3d6adca 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.3.2

Re: [PATCH [alsa-utils] 1/2] alsaconf: support newer m-i-t and kmod

[Takashi Iwai]

At Wed, 13 Nov 2013 13:23:47 -0500,
Mike Frysinger wrote:
> 
> The m-i-t package made it up to 3.10 versions before ending, so update
> the glob to handle those too.
> 
> Most distros are moving on to kmod, so we also want to handle the version
> string that package outputs.
> 
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>

Thanks, applied both patches.

alsaconf is rarely used nowadays, or better to avoid using, but it's
still good to fix potential issues.


Takashi

> ---
>  alsaconf/alsaconf.in | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
> index 5c23787..59f25d1 100644
> --- a/alsaconf/alsaconf.in
> +++ b/alsaconf/alsaconf.in
> @@ -308,9 +308,11 @@ elif [ "$kernel" = "new" ]; then
>      cfgout="/etc/modprobe.d/50-sound.conf"
>      cfgoldout="/etc/modprobe.d/sound"
>      if [ ! -f $cfgout ]; then
> -	modver=$(modprobe -V | sed -e's/^module-init-tools version //')
> -	case "$modver" in
> -	3.[789]*)
> +	case "$(modprobe -V)" in
> +	"module-init-tools version "3.[789]*|\
> +	"module-init-tools version "3.1[0-9]*)
> +	  ;;
> +	"kmod version "*)
>  	  ;;
>  	*)
>  	  cfgout="/etc/modprobe.d/sound"
> -- 
> 1.8.3.2
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>