summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-07-14 15:40:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-20 15:27:31 +0100
commit114960a7c4c1be6d294b2cf9915a9396045859d1 (patch)
tree5f367e1e196af752ac58b6468fb1de81a263fbf5
parent0931e855ed91de3fdefbd8f4b960110a68319cea (diff)
downloadpoky-114960a7c4c1be6d294b2cf9915a9396045859d1.tar.gz
alsa-tools: Fix recipe build error.
Remove some elements in alsa-tools to avoid build error and further dependency on new recipes. [YOCTO #1038] (From OE-Core rev: 81e92e8eab7f0f3d4ca72d4c7d1b872ebdc82fc8) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch34
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb7
2 files changed, 39 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch b/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch
new file mode 100644
index 0000000000..c7bc2d6bd0
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch
@@ -0,0 +1,34 @@
1Add parameters to autoreconf to support cross compile.
2Remove some sub-components which needs further recipe support.
3
4Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
5
6Upstream-Status: Inappropriate [configuration]
7
8diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile
9--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile 2011-07-06 11:27:40.227665002 +0800
10+++ alsa-tools-1.0.24.1/ld10k1/gitcompile 2011-07-14 13:26:18.017665004 +0800
11@@ -1,6 +1,6 @@
12 #!/bin/bash
13
14-autoreconf -fi || exit 1
15+autoreconf $ACLOCAL_FLAGS -fi || exit 1
16 export CFLAGS='-O2 -Wall -pipe -g'
17 echo "CFLAGS=$CFLAGS"
18 echo "./configure $@"
19diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
20--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800
21+++ alsa-tools-1.0.24.1/Makefile 2011-07-14 15:08:08.877665009 +0800
22@@ -1,9 +1,8 @@
23 VERSION = 1.0.24.1
24 TOP = .
25-SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
26- mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
27- us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \
28- hwmixvolume
29+SUBDIRS = ac3dec as10k1 hdsploader mixartloader pcxhrloader sb16_csp \
30+ seq sscape_ctl us428control usx2yloader vxloader ld10k1 \
31+ hwmixvolume
32
33 all:
34 @for i in $(SUBDIRS); do \
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
index 5b3ea981d3..1bf9cd099a 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb
@@ -5,13 +5,16 @@ SECTION = "console/utils"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6DEPENDS = "alsa-lib ncurses" 6DEPENDS = "alsa-lib ncurses"
7 7
8PR = "r1" 8PR = "r2"
9 9
10LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 10LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
11 11
12SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2" 12SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
13 file://autotools.patch"
13 14
14SRC_URI[md5sum] = "08fe93a12006093e590d7ecc02b119dd" 15SRC_URI[md5sum] = "08fe93a12006093e590d7ecc02b119dd"
15SRC_URI[sha256sum] = "17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05" 16SRC_URI[sha256sum] = "17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05"
16 17
17inherit autotools 18inherit autotools
19
20EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST}' ACLOCAL_FLAGS='-I ${STAGING_DATADIR}/aclocal'"