Skip to contentSkip to conversation

alsa-tools: fix recipe build error.

GIT PULL In review Dongxiao Xu 3 participants 5 messages Jul 19, 2011 – Jul 20, 2011

lore
Share & tools
lore
#0 lore raw

Hi Richard and Saul,

This is the second version of alsa-tools build fix, please help to review and pull.

Changes from v1:
Remove some sub-components to avoid further dependency on gtk+ and fltk.

Thanks,
Dongxiao

The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:

bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:23:09 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/alsa-tools
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/alsa-tools

Dongxiao Xu (1):
alsa-tools: Fix recipe build error.

 .../alsa/alsa-tools-1.0.24.1/autotools.patch       |   34 ++++++++++++++++++++
 .../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb |    7 +++-
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch
#1 lore raw

PATCH 1/1 alsa-tools: Fix recipe build error.

Remove some elements in alsa-tools to avoid build error and further dependency on new recipes.

[YOCTO #1038]

---
 .../alsa/alsa-tools-1.0.24.1/autotools.patch       |   34 ++++++++++++++++++++
 .../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb |    7 +++-
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch
meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch new file +34 -0
new file mode 100644
index 0000000..c7bc2d6
@@ -0,0 +1,34 @@
+Add parameters to autoreconf to support cross compile.
+Remove some sub-components which needs further recipe support.
+
+Signed-off-by: Dongxiao Xu <[email protected]>
+
+Upstream-Status: Inappropriate [configuration]
+
+diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile
+--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile	2011-07-06 11:27:40.227665002 +0800
++++ alsa-tools-1.0.24.1/ld10k1/gitcompile	2011-07-14 13:26:18.017665004 +0800
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ 
+-autoreconf -fi || exit 1
++autoreconf $ACLOCAL_FLAGS -fi || exit 1
+ export CFLAGS='-O2 -Wall -pipe -g'
+ echo "CFLAGS=$CFLAGS"
+ echo "./configure $@"
+diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
+--- alsa-tools-1.0.24.1-orig//Makefile	2011-07-06 11:27:40.207665000 +0800
++++ alsa-tools-1.0.24.1/Makefile	2011-07-14 15:08:08.877665009 +0800
+@@ -1,9 +1,8 @@
+ VERSION = 1.0.24.1
+ TOP = .
+-SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
+-	  mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
+-	  us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \
+-	  hwmixvolume
++SUBDIRS = ac3dec as10k1 hdsploader mixartloader pcxhrloader sb16_csp \
++          seq sscape_ctl us428control usx2yloader vxloader ld10k1 \
++          hwmixvolume
+ 
+ all:
+ 	@for i in $(SUBDIRS); do \
meta/recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb +5 -2
index 5b3ea98..1bf9cd0 100644
@@ -5,13 +5,16 @@ SECTION = "console/utils"
 LICENSE = "GPLv2"
 DEPENDS = "alsa-lib ncurses"
 
-PR = "r1"
+PR = "r2"
 
 LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
+           file://autotools.patch"
 
 SRC_URI[md5sum] = "08fe93a12006093e590d7ecc02b119dd"
 SRC_URI[sha256sum] = "17d43de93ab2db98886d89a53e45341daa46a4ef6edd405db87f4b5a5dc64a05"
 
 inherit autotools
+
+EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST}' ACLOCAL_FLAGS='-I ${STAGING_DATADIR}/aclocal'"
Signature · 1 line
1.7.1
#2 lore raw

Re: [PATCH 1/1] alsa-tools: Fix recipe build error.

Quoted 39 lines · Dongxiao Xu

Remove some elements in alsa-tools to avoid build error and further dependency on new recipes.

[YOCTO #1038]

---
 .../alsa/alsa-tools-1.0.24.1/autotools.patch       |   34 ++++++++++++++++++++ .../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb |    7 +++-

 2 files changed, 39 insertions(+), 2 deletions(-)

 create mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch

meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch new file +21 -0
new file mode 100644
index 0000000..c7bc2d6
@@ -0,0 +1,34 @@
+Add parameters to autoreconf to support cross compile.
+Remove some sub-components which needs further recipe support.
+
+Signed-off-by: Dongxiao Xu <[email protected]>
+
+Upstream-Status: Inappropriate [configuration]
+
+diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile alsa-tools-1.0.24.1/ld10k1/gitcompile
+--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile        2011-07-06 11:27:40.227665002 +0800
++++ alsa-tools-1.0.24.1/ld10k1/gitcompile      2011-07-14 13:26:18.017665004 +0800
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+
+-autoreconf -fi || exit 1
++autoreconf $ACLOCAL_FLAGS -fi || exit 1
+ export CFLAGS='-O2 -Wall -pipe -g'
+ echo "CFLAGS=$CFLAGS"
+ echo "./configure $@"
+diff -ruN alsa-tools-1.0.24.1-orig//Makefile alsa-tools-1.0.24.1/Makefile
+--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000 +0800
++++ alsa-tools-1.0.24.1/Makefile       2011-07-14 15:08:08.877665009 +0800

meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch line 31

Quoted 10 lines
meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch new file +10 -0
+@@ -1,9 +1,8 @@
+ VERSION = 1.0.24.1
+ TOP = .
+-SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer \
+-        mixartloader pcxhrloader rmedigicontrol sb16_csp seq sscape_ctl \
+-        us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \
+-        hwmixvolume
++SUBDIRS = ac3dec as10k1 hdsploader mixartloader pcxhrloader sb16_csp \
++          seq sscape_ctl us428control usx2yloader vxloader ld10k1 \
++          hwmixvolume

does --disable-envy24control etc. work ?

#3 lore raw

Re: [PATCH 1/1] alsa-tools: Fix recipe build error.

Hi Khem,

Quoted 66 lines

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Khem Raj
Sent: Tuesday, July 19, 2011 8:47 AM
To: Patches and discussions about the oe-core layer
Subject: Re: [OE-core] [PATCH 1/1] alsa-tools: Fix recipe build error.

Quoted 56 lines · Dongxiao Xu

Remove some elements in alsa-tools to avoid build error and further dependency on new recipes.

[YOCTO #1038]

---
 .../alsa/alsa-tools-1.0.24.1/autotools.patch       |   34
++++++++++++++++++++
 .../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb |    7 +++-

 2 files changed, 39 insertions(+), 2 deletions(-)

 create mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch

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 0000000..c7bc2d6

meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch new file +34 -0
@@ -0,0 +1,34 @@
+Add parameters to autoreconf to support cross compile.
+Remove some sub-components which needs further recipe support.
+
+Signed-off-by: Dongxiao Xu <[email protected]>
+
+Upstream-Status: Inappropriate [configuration]
+
+diff -ruN alsa-tools-1.0.24.1-orig//ld10k1/gitcompile
+alsa-tools-1.0.24.1/ld10k1/gitcompile
+--- alsa-tools-1.0.24.1-orig//ld10k1/gitcompile        2011-07-06
+11:27:40.227665002 +0800
++++ alsa-tools-1.0.24.1/ld10k1/gitcompile      2011-07-14
++++ 13:26:18.017665004 +0800
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+
+-autoreconf -fi || exit 1
++autoreconf $ACLOCAL_FLAGS -fi || exit 1
+ export CFLAGS='-O2 -Wall -pipe -g'
+ echo "CFLAGS=$CFLAGS"
+ echo "./configure $@"
+diff -ruN alsa-tools-1.0.24.1-orig//Makefile
+alsa-tools-1.0.24.1/Makefile
+--- alsa-tools-1.0.24.1-orig//Makefile 2011-07-06 11:27:40.207665000
++0800
++++ alsa-tools-1.0.24.1/Makefile       2011-07-14 15:08:08.877665009
++++ +0800
+@@ -1,9 +1,8 @@
+ VERSION = 1.0.24.1
+ TOP = .
+-SUBDIRS = ac3dec as10k1 envy24control hdsploader hdspconf hdspmixer
+\
+-        mixartloader pcxhrloader rmedigicontrol sb16_csp seq
+sscape_ctl \
Quoted 8 lines
Quoted 6 lines
+-        us428control usx2yloader vxloader echomixer ld10k1 qlo10k1 \
+-        hwmixvolume

++SUBDIRS = ac3dec as10k1 hdsploader mixartloader pcxhrloader sb16_csp ++\
++          seq sscape_ctl us428control usx2yloader vxloader ld10k1 \
++          hwmixvolume

does --disable-envy24control etc. work ?

The above approach doesn't work since the alsa-tools project only has a global Makefile while no configure files.

Thanks,
Dongxiao

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Applied
#4 lore raw
In reply to Dongxiao Xu
Quoted 24 lines · Dongxiao Xu

Hi Richard and Saul,

This is the second version of alsa-tools build fix, please help to review and pull.

Changes from v1:
Remove some sub-components to avoid further dependency on gtk+ and fltk.

Thanks,
Dongxiao

The following changes since commit fa4bcfdb73167f8159b88e5a4d711c0d37627a70:

bb-matrix: correct BB and PM number canonicalization (2011-07-14 22:23:09 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/alsa-tools
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/alsa-tools

Dongxiao Xu (1):
alsa-tools: Fix recipe build error.

  .../alsa/alsa-tools-1.0.24.1/autotools.patch       |   34 ++++++++++++++++++++
  .../recipes-multimedia/alsa/alsa-tools_1.0.24.1.bb |    7 +++-
  2 files changed, 39 insertions(+), 2 deletions(-)
Quoted 8 lines

create mode 100644 meta/recipes-multimedia/alsa/alsa-tools-1.0.24.1/autotools.patch

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!