[ptxdist] [PATCH] alsa-lib: Allow installation of /etc/asound.conf

[ptxdist] [PATCH] alsa-lib: Allow installation of /etc/asound.conf

[bernhard]

From: Bernhard Walle <walle@corscience.de>

Some systems require a tuned /etc/asound.conf, for example for special
mixer entries.

Signed-off-by: Bernhard Walle <walle@corscience.de>
---
 rules/alsa-lib.in   |    6 ++++++
 rules/alsa-lib.make |    6 ++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in
index 393a02a..c32d361 100644
--- a/rules/alsa-lib.in
+++ b/rules/alsa-lib.in
@@ -38,6 +38,12 @@ choice
 		  conversion is available with SALSA-lib.
 endchoice
 
+config ALSA_LIB_ASOUND_CONF
+	bool
+	prompt "install /etc/asound.conf from projectroot"
+	help
+	  install a asound.conf file from the projectroot
+
 config ALSA_LIB_RESMGR
 	bool
 	depends on BROKEN
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 929ab4e..bfec83f 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -207,6 +207,12 @@ endif
 		/usr/share/alsa/pcm/dsnoop.conf)
 endif
 
+ifdef PTXCONF_ALSA_LIB_ASOUND_CONF
+	@$(call install_copy, alsa-lib, 0, 0, 0644, \
+		$(PTXDIST_WORKSPACE)/projectroot/etc/asound.conf, \
+		/etc/asound.conf)
+endif
+
 	@$(call install_finish, alsa-lib)
 
 	@$(call touch)
-- 
1.7.7.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] alsa-lib: Allow installation of /etc/asound.conf

[Juergen Beisert]

bernhard@bwalle.de wrote:
> [...]
> diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
> index 929ab4e..bfec83f 100644
> --- a/rules/alsa-lib.make
> +++ b/rules/alsa-lib.make
> @@ -207,6 +207,12 @@ endif
>  		/usr/share/alsa/pcm/dsnoop.conf)
>  endif
>
> +ifdef PTXCONF_ALSA_LIB_ASOUND_CONF
> +	@$(call install_copy, alsa-lib, 0, 0, 0644, \
> +		$(PTXDIST_WORKSPACE)/projectroot/etc/asound.conf, \
> +		/etc/asound.conf)
> +endif
> +

You should use the 'install_alternative' macro here. It's more flexible and 
you also can store this special file in the platform instead of the BSP 
project (as this file is more related to the platform than the BSP).

jbe

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] alsa-lib: Allow installation of /etc/asound.conf

[Bernhard Walle]

* Juergen Beisert <jbe@pengutronix.de> [2011-11-08 15:29]:
> bernhard@bwalle.de wrote:
> > [...]
> > diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
> > index 929ab4e..bfec83f 100644
> > --- a/rules/alsa-lib.make
> > +++ b/rules/alsa-lib.make
> > @@ -207,6 +207,12 @@ endif
> >  		/usr/share/alsa/pcm/dsnoop.conf)
> >  endif
> >
> > +ifdef PTXCONF_ALSA_LIB_ASOUND_CONF
> > +	@$(call install_copy, alsa-lib, 0, 0, 0644, \
> > +		$(PTXDIST_WORKSPACE)/projectroot/etc/asound.conf, \
> > +		/etc/asound.conf)
> > +endif
> > +
> 
> You should use the 'install_alternative' macro here. It's more flexible and 
> you also can store this special file in the platform instead of the BSP 
> project (as this file is more related to the platform than the BSP).

Ah, yes, sorry. It's still from my first steps with ptxdist and after
the latest ALSA update I had to adjust my copied alsa-lib.*, so I
thought it's better to send it mainline. Unfortunately, I didn't take a
closer look ...

Updated patch will follow.


Regards,
Bernhard

-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] alsa-lib: Allow installation of /etc/asound.conf

[bernhard]

From: Bernhard Walle <walle@corscience.de>

Some systems require a tuned /etc/asound.conf, for example for special
mixer entries.

Signed-off-by: Bernhard Walle <walle@corscience.de>
---
 rules/alsa-lib.in   |    6 ++++++
 rules/alsa-lib.make |    4 ++++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/rules/alsa-lib.in b/rules/alsa-lib.in
index 393a02a..c32d361 100644
--- a/rules/alsa-lib.in
+++ b/rules/alsa-lib.in
@@ -38,6 +38,12 @@ choice
 		  conversion is available with SALSA-lib.
 endchoice
 
+config ALSA_LIB_ASOUND_CONF
+	bool
+	prompt "install /etc/asound.conf from projectroot"
+	help
+	  install a asound.conf file from the projectroot
+
 config ALSA_LIB_RESMGR
 	bool
 	depends on BROKEN
diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make
index 929ab4e..a8288dc 100644
--- a/rules/alsa-lib.make
+++ b/rules/alsa-lib.make
@@ -207,6 +207,10 @@ endif
 		/usr/share/alsa/pcm/dsnoop.conf)
 endif
 
+ifdef PTXCONF_ALSA_LIB_ASOUND_CONF
+	@$(call install_alternative, alsa-lib, 0, 0, 0644, /etc/asound.conf)
+endif
+
 	@$(call install_finish, alsa-lib)
 
 	@$(call touch)
-- 
1.7.7.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de