diff options
| author |   Cristian Iorga <cristian.iorga@intel.com> | 2013-01-21 11:19:59 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-28 12:29:30 +0000 |
| commit | 336d70c0adc070d83ba845206818630c7dd316c1 (patch) | |
| tree | f43bbb4c46e7dbf24280fc673c7e50a72491dc91 /meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | |
| parent | 98bee847ac923d9bf99b8d3457f7b5f6c20d6372 (diff) | |
| download | openembedded-core-contrib-336d70c0adc070d83ba845206818630c7dd316c1.tar.gz | |
alsa-utils: upgrade to 1.0.26
ncursesfix.patch is no longer necessary,
build system fixed upstream.
ncursesfix.patch removed.
(From OE-Core rev: 1dccd16e29186e7baad6ebcf189b7ea2463c2275)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch new file mode 100644 index 0000000000..1690ca566c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch @@ -0,0 +1,46 @@ +From 37c99a3cbff36915b56a5703eeaed3c70796f80f Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Sun, 9 Oct 2011 20:06:35 +0200 +Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound.state is missing + +This avoids an error on bootup + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + +Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 + +Upstream-Status: Pending + + alsactl/Makefile.am | 2 +- + alsactl/alsa-restore.service.in | 1 + + 2 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am +index 5cfc415..c3768c4 100644 +--- a/alsactl/Makefile.am ++++ b/alsactl/Makefile.am +@@ -34,7 +34,7 @@ install-data-hook: + endif + + edit = \ +- $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ ++ $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ + + alsa-store.service: alsa-store.service.in + $(edit) +diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in +index e97d196..3b76710 100644 +--- a/alsactl/alsa-restore.service.in ++++ b/alsactl/alsa-restore.service.in +@@ -4,6 +4,7 @@ DefaultDependencies=no + After=sysinit.target + Before=shutdown.target + Conflicts=shutdown.target ++ConditionPathExists=@localstatedir@/lib/alsa/asound.state + + [Service] + Type=oneshot +-- +1.6.6.1 + |