diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2013-07-31 17:49:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-03 10:33:09 +0100 |
commit | 4813e2d56585d276c7c8ddd2c13d3b41feb231a6 (patch) | |
tree | 98205f67cebae85db273b1822eee0ce1de8f1fa9 /meta/recipes-multimedia/alsa/alsa-utils/0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch | |
parent | 6d5d0c41a7cc52e429bfd69ea0ec9215f8150b51 (diff) | |
download | poky-4813e2d56585d276c7c8ddd2c13d3b41feb231a6.tar.gz |
alsa-utils: upgrade to 1.0.27.2
obsolete_automake_macros.patch,
uclibc-exp10-replacement.patch patches removed;
included in upstream.
(From OE-Core rev: f74b10cbbecdabcbef695bbdfd26ca4c35c7d369)
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 | 40 |
1 files changed, 17 insertions, 23 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 index 1690ca566c..477cd11b12 100644 --- 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 | |||
@@ -6,41 +6,35 @@ Subject: [PATCH] alsactl: don't let systemd unit restore the volume when asound. | |||
6 | This avoids an error on bootup | 6 | This avoids an error on bootup |
7 | 7 | ||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
9 | --- | ||
10 | 9 | ||
11 | Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 | 10 | Filed as https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5459 |
12 | 11 | ||
13 | Upstream-Status: Pending | 12 | Upstream-Status: Pending |
14 | 13 | ||
15 | alsactl/Makefile.am | 2 +- | 14 | Index: alsa-utils-1.0.27.2/alsactl/Makefile.am |
16 | alsactl/alsa-restore.service.in | 1 + | 15 | =================================================================== |
17 | 2 files changed, 2 insertions(+), 1 deletions(-) | 16 | --- alsa-utils-1.0.27.2.orig/alsactl/Makefile.am |
18 | 17 | +++ alsa-utils-1.0.27.2/alsactl/Makefile.am | |
19 | diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am | 18 | @@ -36,8 +36,8 @@ install-data-hook: |
20 | index 5cfc415..c3768c4 100644 | ||
21 | --- a/alsactl/Makefile.am | ||
22 | +++ b/alsactl/Makefile.am | ||
23 | @@ -34,7 +34,7 @@ install-data-hook: | ||
24 | endif | 19 | endif |
25 | 20 | ||
26 | edit = \ | 21 | edit = \ |
27 | - $(SED) -r 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ | 22 | - $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ |
28 | + $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' < $< > $@ || rm $@ | 23 | - -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ |
24 | + $(SED) -e 's,@localstatedir\@,$(localstatedir),g' -e 's,@sbindir\@,$(sbindir),g' \ | ||
25 | + -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ | ||
26 | < $< > $@ || rm $@ | ||
29 | 27 | ||
30 | alsa-store.service: alsa-store.service.in | 28 | alsa-state.service: alsa-state.service.in |
31 | $(edit) | 29 | Index: alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in |
32 | diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in | 30 | =================================================================== |
33 | index e97d196..3b76710 100644 | 31 | --- alsa-utils-1.0.27.2.orig/alsactl/alsa-restore.service.in |
34 | --- a/alsactl/alsa-restore.service.in | 32 | +++ alsa-utils-1.0.27.2/alsactl/alsa-restore.service.in |
35 | +++ b/alsactl/alsa-restore.service.in | 33 | @@ -10,6 +10,7 @@ DefaultDependencies=no |
36 | @@ -4,6 +4,7 @@ DefaultDependencies=no | 34 | After=alsa-state.service |
37 | After=sysinit.target | ||
38 | Before=shutdown.target | 35 | Before=shutdown.target |
39 | Conflicts=shutdown.target | 36 | Conflicts=shutdown.target |
40 | +ConditionPathExists=@localstatedir@/lib/alsa/asound.state | 37 | +ConditionPathExists=@localstatedir@/lib/alsa/asound.state |
41 | 38 | ||
42 | [Service] | 39 | [Service] |
43 | Type=oneshot | 40 | Type=oneshot |
44 | -- | ||
45 | 1.6.6.1 | ||
46 | |||