diff options
author | Kai Kang <kai.kang@windriver.com> | 2015-05-28 16:23:04 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-30 22:26:13 +0100 |
commit | 511865f189efc404df1b245c7eddeca2229ebdbf (patch) | |
tree | c9e13d974bbeed3aefb5dce6eb9b4eb430a7a0a0 /meta/recipes-multimedia | |
parent | 30adf4bbcb56cdfebed6308687601fe77b932ea8 (diff) | |
download | poky-511865f189efc404df1b245c7eddeca2229ebdbf.tar.gz |
alsa-tools: update makefile_no_gtk.patch
makefile_no_gtk.patch will be applied when no 'x11' in distro features.
It fails to apply after update to version 1.0.29. Fix it.
(From OE-Core rev: 787acab921b41082c4e8ca87bc40ae4e60954af8)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch index 26657266a8..c957609611 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch +++ b/meta/recipes-multimedia/alsa/alsa-tools/makefile_no_gtk.patch | |||
@@ -5,21 +5,25 @@ Upstream-Status: Inappropriate [configuration] | |||
5 | Signed-off-by: Rogerio Nunes <ronunes@gmail.com> | 5 | Signed-off-by: Rogerio Nunes <ronunes@gmail.com> |
6 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | 6 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> |
7 | 7 | ||
8 | Update patch for alsa-tools 1.0.29 | ||
9 | |||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
11 | |||
8 | diff --git a/Makefile b/Makefile | 12 | diff --git a/Makefile b/Makefile |
9 | index 2457a1c..72346d9 100644 | 13 | index 2457a1c..72346d9 100644 |
10 | --- a/Makefile | 14 | --- a/Makefile |
11 | +++ b/Makefile | 15 | +++ b/Makefile |
12 | @@ -1,9 +1,9 @@ | 16 | @@ -1,9 +1,9 @@ |
13 | VERSION = 1.0.27 | 17 | VERSION = 1.0.29 |
14 | TOP = . | 18 | TOP = . |
15 | -SUBDIRS = as10k1 envy24control \ | 19 | -SUBDIRS = as10k1 envy24control \ |
16 | - mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ | 20 | - mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \ |
17 | - us428control usx2yloader vxloader echomixer \ | 21 | - us428control usx2yloader vxloader echomixer \ |
18 | - hwmixvolume hdajackretask hda-verb | 22 | - hwmixvolume hdajackretask hda-verb hdajacksensetest |
19 | +SUBDIRS = as10k1 \ | 23 | +SUBDIRS = as10k1 \ |
20 | + mixartloader pcxhrloader sb16_csp seq sscape_ctl \ | 24 | + mixartloader pcxhrloader sb16_csp seq sscape_ctl \ |
21 | + us428control usx2yloader vxloader \ | 25 | + us428control usx2yloader vxloader \ |
22 | + hwmixvolume hda-verb | 26 | + hwmixvolume hda-verb hdajacksensetest |
23 | 27 | ||
24 | all: | 28 | all: |
25 | @for i in $(SUBDIRS); do \ | 29 | @for i in $(SUBDIRS); do \ |