* [PATCH 1/7] wireless-tools: remove ldconfig call from install-libs
2012-02-23 10:42 [PATCH 0/7] Pending patches Martin Jansa
@ 2012-02-23 10:43 ` Martin Jansa
2012-02-23 10:43 ` [PATCH 2/7] bitbake.conf: use weak assignment for BB_CONSOLELOG Martin Jansa
` (5 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2012-02-23 10:43 UTC (permalink / raw)
To: openembedded-core
* and drop apply=yes param as it's not needed
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../wireless-tools/remove.ldconfig.call.patch | 19 +++++++++++++++++++
.../wireless-tools/wireless-tools_29.bb | 5 +++--
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch b/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
new file mode 100644
index 0000000..3a22c3f
--- /dev/null
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
@@ -0,0 +1,19 @@
+When /etc/ld.so.cache is writeable by user running bitbake then it creates invalid cache
+(in my case libstdc++.so cannot be found after building zlib(-native) and I have to call
+touch */libstdc++.so && /sbin/ldconfig to fix it.
+
+So remove ldconfig call from make install-libs
+
+Upstream-Status: Inappropriate [disable feature]
+
+diff -uNr wireless_tools.29.orig/Makefile wireless_tools.29/Makefile
+--- wireless_tools.29.orig/Makefile 2007-09-18 01:56:46.000000000 +0200
++++ wireless_tools.29/Makefile 2012-02-15 20:46:41.780763514 +0100
+@@ -163,7 +163,6 @@
+ install -m 755 $(DYNAMIC) $(INSTALL_LIB)
+ ln -sfn $(DYNAMIC) $(INSTALL_LIB)/$(DYNAMIC_LINK)
+ @echo "*** Don't forget to add $(INSTALL_LIB) to /etc/ld.so.conf, and run ldconfig as root. ***"
+- @$(LDCONFIG) || echo "*** Could not run ldconfig ! ***"
+
+ # Install the static library
+ install-static:: $(STATIC)
diff --git a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
index cc51dec..c6235d6 100644
--- a/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
+++ b/meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://sample_enc.c;beginline=1;endline=4;md5=838372be07874260b566bae2f6ed33b6"
SECTION = "base"
PE = "1"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.29.tar.gz \
- file://man.patch;apply=yes \
+ file://remove.ldconfig.call.patch \
+ file://man.patch \
file://wireless-tools.if-pre-up \
file://zzz-wireless.if-pre-up \
file://avoid_strip.patch"
--
1.7.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/7] bitbake.conf: use weak assignment for BB_CONSOLELOG
2012-02-23 10:42 [PATCH 0/7] Pending patches Martin Jansa
2012-02-23 10:43 ` [PATCH 1/7] wireless-tools: remove ldconfig call from install-libs Martin Jansa
@ 2012-02-23 10:43 ` Martin Jansa
2012-02-24 0:40 ` Richard Purdie
2012-02-23 10:43 ` [PATCH 3/7] sstatesig: add pointercal-xinput to excluded machine specific configs Martin Jansa
` (4 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2012-02-23 10:43 UTC (permalink / raw)
To: openembedded-core
* some people prefer subdirectory like /cooker/.log
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/bitbake.conf | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 90e5f7a..869b409 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -723,7 +723,8 @@ DISTRO[unexport] = "1"
# Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
-BB_CONSOLELOG = "${TMPDIR}/cooker.log.${DATETIME}"
+# Complete output from bitbake, if you're changing it, make sure to use existing directory
+BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}"
# Setup our default hash policy
BB_SIGNATURE_HANDLER ?= "OEBasic"
--
1.7.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 2/7] bitbake.conf: use weak assignment for BB_CONSOLELOG
2012-02-23 10:43 ` [PATCH 2/7] bitbake.conf: use weak assignment for BB_CONSOLELOG Martin Jansa
@ 2012-02-24 0:40 ` Richard Purdie
2012-02-24 0:47 ` Martin Jansa
0 siblings, 1 reply; 12+ messages in thread
From: Richard Purdie @ 2012-02-24 0:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Thu, 2012-02-23 at 11:43 +0100, Martin Jansa wrote:
> * some people prefer subdirectory like /cooker/.log
I think we should probably change that to the default actually...
Cheers,
Richard
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/conf/bitbake.conf | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 90e5f7a..869b409 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -723,7 +723,8 @@ DISTRO[unexport] = "1"
> # Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
> TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
>
> -BB_CONSOLELOG = "${TMPDIR}/cooker.log.${DATETIME}"
> +# Complete output from bitbake, if you're changing it, make sure to use existing directory
> +BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}"
>
> # Setup our default hash policy
> BB_SIGNATURE_HANDLER ?= "OEBasic"
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 2/7] bitbake.conf: use weak assignment for BB_CONSOLELOG
2012-02-24 0:40 ` Richard Purdie
@ 2012-02-24 0:47 ` Martin Jansa
0 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2012-02-24 0:47 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1741 bytes --]
On Fri, Feb 24, 2012 at 12:40:07AM +0000, Richard Purdie wrote:
> On Thu, 2012-02-23 at 11:43 +0100, Martin Jansa wrote:
> > * some people prefer subdirectory like /cooker/.log
>
> I think we should probably change that to the default actually...
But that would need to implement that directory creation if it doesn't
exist. (I have to create it manually for each build from scratch). And
because it's in bitbake then we can make this default only after
increasing required bitbake version (which we should anyway for latest
sstate changes..).
Cheers,
> Cheers,
>
> Richard
>
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/conf/bitbake.conf | 3 ++-
> > 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> > index 90e5f7a..869b409 100644
> > --- a/meta/conf/bitbake.conf
> > +++ b/meta/conf/bitbake.conf
> > @@ -723,7 +723,8 @@ DISTRO[unexport] = "1"
> > # Used by canadian-cross to handle string conversions on TARGET_ARCH where needed
> > TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
> >
> > -BB_CONSOLELOG = "${TMPDIR}/cooker.log.${DATETIME}"
> > +# Complete output from bitbake, if you're changing it, make sure to use existing directory
> > +BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}"
> >
> > # Setup our default hash policy
> > BB_SIGNATURE_HANDLER ?= "OEBasic"
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/7] sstatesig: add pointercal-xinput to excluded machine specific configs
2012-02-23 10:42 [PATCH 0/7] Pending patches Martin Jansa
2012-02-23 10:43 ` [PATCH 1/7] wireless-tools: remove ldconfig call from install-libs Martin Jansa
2012-02-23 10:43 ` [PATCH 2/7] bitbake.conf: use weak assignment for BB_CONSOLELOG Martin Jansa
@ 2012-02-23 10:43 ` Martin Jansa
2012-02-24 0:36 ` Saul Wold
2012-02-23 10:43 ` [PATCH 4/7] python: add Makefile to SSTATE_SCAN_FILES Martin Jansa
` (3 subsequent siblings)
6 siblings, 1 reply; 12+ messages in thread
From: Martin Jansa @ 2012-02-23 10:43 UTC (permalink / raw)
To: openembedded-core
* it's used by xinput-calibrator in meta-oe but contains just calibration data like pointercal does for tslib
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/lib/oe/sstatesig.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
index ee7cbad..080b722 100644
--- a/meta/lib/oe/sstatesig.py
+++ b/meta/lib/oe/sstatesig.py
@@ -27,7 +27,7 @@ def sstate_rundepfilter(fn, recipename, task, dep, depname):
return False
# Exclude well defined machine specific configurations which don't change ABI
- if depname in ['sysvinit-inittab', 'shadow-securetty', 'opkg-config-base', 'netbase', 'formfactor', 'xserver-xf86-config', 'pointercal', 'base-files']:
+ if depname in ['sysvinit-inittab', 'shadow-securetty', 'opkg-config-base', 'netbase', 'formfactor', 'xserver-xf86-config', 'pointercal', 'pointercal-xinput', 'base-files']:
return False
# Default to keep dependencies
--
1.7.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 3/7] sstatesig: add pointercal-xinput to excluded machine specific configs
2012-02-23 10:43 ` [PATCH 3/7] sstatesig: add pointercal-xinput to excluded machine specific configs Martin Jansa
@ 2012-02-24 0:36 ` Saul Wold
2012-02-24 0:49 ` Martin Jansa
0 siblings, 1 reply; 12+ messages in thread
From: Saul Wold @ 2012-02-24 0:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Martin Jansa
On 02/23/2012 02:43 AM, Martin Jansa wrote:
> * it's used by xinput-calibrator in meta-oe but contains just calibration data like pointercal does for tslib
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
> meta/lib/oe/sstatesig.py | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
> index ee7cbad..080b722 100644
> --- a/meta/lib/oe/sstatesig.py
> +++ b/meta/lib/oe/sstatesig.py
> @@ -27,7 +27,7 @@ def sstate_rundepfilter(fn, recipename, task, dep, depname):
> return False
>
> # Exclude well defined machine specific configurations which don't change ABI
> - if depname in ['sysvinit-inittab', 'shadow-securetty', 'opkg-config-base', 'netbase', 'formfactor', 'xserver-xf86-config', 'pointercal', 'base-files']:
> + if depname in ['sysvinit-inittab', 'shadow-securetty', 'opkg-config-base', 'netbase', 'formfactor', 'xserver-xf86-config', 'pointercal', 'pointercal-xinput', 'base-files']:
> return False
>
> # Default to keep dependencies
This patch needs to be re-based to use RP's new
SIGGEN_EXCLUDERECIPES_ABISAFE variable in layer.conf
Thanks
Sau!
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/7] sstatesig: add pointercal-xinput to excluded machine specific configs
2012-02-24 0:36 ` Saul Wold
@ 2012-02-24 0:49 ` Martin Jansa
0 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2012-02-24 0:49 UTC (permalink / raw)
To: Saul Wold; +Cc: Patches and discussions about the oe-core layer
[-- Attachment #1: Type: text/plain, Size: 1511 bytes --]
On Thu, Feb 23, 2012 at 04:36:35PM -0800, Saul Wold wrote:
> On 02/23/2012 02:43 AM, Martin Jansa wrote:
> > * it's used by xinput-calibrator in meta-oe but contains just calibration data like pointercal does for tslib
> >
> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > ---
> > meta/lib/oe/sstatesig.py | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
> > index ee7cbad..080b722 100644
> > --- a/meta/lib/oe/sstatesig.py
> > +++ b/meta/lib/oe/sstatesig.py
> > @@ -27,7 +27,7 @@ def sstate_rundepfilter(fn, recipename, task, dep, depname):
> > return False
> >
> > # Exclude well defined machine specific configurations which don't change ABI
> > - if depname in ['sysvinit-inittab', 'shadow-securetty', 'opkg-config-base', 'netbase', 'formfactor', 'xserver-xf86-config', 'pointercal', 'base-files']:
> > + if depname in ['sysvinit-inittab', 'shadow-securetty', 'opkg-config-base', 'netbase', 'formfactor', 'xserver-xf86-config', 'pointercal', 'pointercal-xinput', 'base-files']:
> > return False
> >
> > # Default to keep dependencies
>
> This patch needs to be re-based to use RP's new
> SIGGEN_EXCLUDERECIPES_ABISAFE variable in layer.conf
Patch adding this to meta-oe's SIGGEN_EXCLUDERECIPES_ABISAFE was already
sent, so ignore this one.
Cheers,
>
> Thanks
> Sau!
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/7] python: add Makefile to SSTATE_SCAN_FILES
2012-02-23 10:42 [PATCH 0/7] Pending patches Martin Jansa
` (2 preceding siblings ...)
2012-02-23 10:43 ` [PATCH 3/7] sstatesig: add pointercal-xinput to excluded machine specific configs Martin Jansa
@ 2012-02-23 10:43 ` Martin Jansa
2012-02-23 10:43 ` [PATCH 5/7] bitbake.conf: introduce SDK_NAME_PREFIX and NATIVESDK_* variables Martin Jansa
` (2 subsequent siblings)
6 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2012-02-23 10:43 UTC (permalink / raw)
To: openembedded-core
* it contains sysroot specific paths, this is from om-gta04 sysroot and
notice nokia900
./usr/lib/python2.7/config/Makefile:CC= arm-oe-linux-gnueabi-gcc -march=armv7-a -fno-tree-vectorize -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 -D__SOFTFP__ --sysroot=/OE/shr-core/tmp-eglibc/sysroots/nokia900
./usr/lib/python2.7/config/Makefile:CXX= arm-oe-linux-gnueabi-g++ -march=armv7-a -fno-tree-vectorize -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 -D__SOFTFP__ --sysroot=/OE/shr-core/tmp-eglibc/sysroots/nokia900
./usr/lib/python2.7/config/Makefile:LDFLAGS=-L. -L/OE/shr-core/tmp-eglibc/sysroots/nokia900/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed
./usr/lib/python2.7/config/Makefile:LIBDIR= /OE/shr-core/tmp-eglibc/sysroots/nokia900/usr/lib
./usr/lib/python2.7/config/Makefile:INCLUDEDIR= /OE/shr-core/tmp-eglibc/sysroots/nokia900/usr/include
./usr/lib/python2.7/config/Makefile:CONFIG_ARGS= '--build=x86_64-linux' '--host=arm-oe-linux-gnueabi' '--target=arm-oe-linux-gnueabi' '--prefix=/usr' '--exec_prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--libexecdir=/OE/shr-core/tmp-eglibc/sysroots/nokia900/usr/libexec' '--datadir=/usr/share' '--sysconfdir=/etc' '--sharedstatedir=/com' '--localstatedir=/var' '--libdir=/usr/lib' '--includedir=/OE/shr-core/tmp-eglibc/sysroots/nokia900/usr/include' '--oldincludedir=/usr/include' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--disable-silent-rules' '--disable-dependency-tracking' \
'--with-libtool-sysroot=/OE/shr-core/tmp-eglibc/sysroots/nokia900' '--with-threads' '--with-pymalloc' '--with-cyclic-gc' '--without-cxx' '--with-signal-module' '--with-wctype-functions' '--enable-shared' 'build_alias=x86_64-linux' 'host_alias=arm-oe-linux-gnueabi' 'target_alias=arm-oe-linux-gnueabi' 'CC=arm-oe-linux-gnueabi-gcc -march=armv7-a -fno-tree-vectorize -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 -D__SOFTFP__ --sysroot=/OE/shr-core/tmp-eglibc/sysroots/nokia900' 'CFLAGS=-O2 -pipe -g -feliminate-unused-debug-types' 'LDFLAGS=-L. -L/OE/shr-core/tmp-eglibc/sysroots/nokia900/usr/lib-Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed' 'CPPFLAGS=' 'CPP=arm-oe-linux-gnueabi-gcc -E --sysroot=/OE/shr-core/tmp-eglibc/sysroots/nokia900 -march=armv7-a -fno-tree-vectorize -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a8 -D__SOFTFP__'
./usr/lib/python2.7/config/Makefile: $(RUNSHARED) /OE/shr-core/tmp-eglibc/sysroots/nokia900/usr/libexec/oah/translate ./$(BUILDPYTHON) -E -tt $(TESTPROG) -uall $(TESTOPTS)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-devtools/python/python_2.7.2.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index fb5e860..2b18c53 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -100,6 +100,7 @@ do_install() {
fi
}
+SSTATE_SCAN_FILES += "Makefile"
PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess"
py_package_preprocess () {
--
1.7.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/7] bitbake.conf: introduce SDK_NAME_PREFIX and NATIVESDK_* variables
2012-02-23 10:42 [PATCH 0/7] Pending patches Martin Jansa
` (3 preceding siblings ...)
2012-02-23 10:43 ` [PATCH 4/7] python: add Makefile to SSTATE_SCAN_FILES Martin Jansa
@ 2012-02-23 10:43 ` Martin Jansa
2012-02-23 10:43 ` [PATCH 6/7] gdb-cross-canadian: build gdb with python support Martin Jansa
2012-02-23 10:43 ` [PATCH 7/7] gdb-cross-canadian: use NATIVESDK paths as it happens to be here Martin Jansa
6 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2012-02-23 10:43 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/bitbake.conf | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 869b409..4f8d11c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -360,9 +360,20 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
-SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
+##################################################################
+# SDK variables,
+# SDK_NAME/NATIVESDK_NAME and SDKPATH/NATIVESDKPATH need to be
+# consistent, so if you want to overwrite it, then overwrite both
+##################################################################
+
+SDK_NAME_PREFIX = "oecore"
+SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${TARGET_ARCH}"
SDKPATH = "/usr/local/${SDK_NAME}"
SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"
+# for cross-canadian recipe to find nativesdk stuff, there is SDK_ARCH instead of TARGET_ARCH in SDK_NAME
+NATIVESDK_SDK_NAME = "${SDK_NAME_PREFIX}-${SDK_ARCH}-${SDK_ARCH}"
+NATIVESDK_SDKPATH = "/usr/local/${NATIVESDK_SDK_NAME}"
+NATIVESDK_SDKPATHNATIVE = "${NATIVESDK_SDKPATH}/sysroots/${SDK_SYS}"
##################################################################
# Kernel info.
--
1.7.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/7] gdb-cross-canadian: build gdb with python support
2012-02-23 10:42 [PATCH 0/7] Pending patches Martin Jansa
` (4 preceding siblings ...)
2012-02-23 10:43 ` [PATCH 5/7] bitbake.conf: introduce SDK_NAME_PREFIX and NATIVESDK_* variables Martin Jansa
@ 2012-02-23 10:43 ` Martin Jansa
2012-02-23 10:43 ` [PATCH 7/7] gdb-cross-canadian: use NATIVESDK paths as it happens to be here Martin Jansa
6 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2012-02-23 10:43 UTC (permalink / raw)
To: openembedded-core
From: Eric BENARD <eric@eukrea.com>
* python support is needed for providing finer scripting control
in gdb, and for remote controling gdb for example from qtcreator
* gdb/configure tries to autodetect python using python executable
with --includes --ldflags --exec-prefix to get the right flags
As it's difficult to achieve in OE's context, we generate a
script which will return the right values and make gdb's build
system happy. This idea was taken from the following article :
http://www.mentby.com/doug-evans-2/python-enabled-gdb-on-windows-and-relocation.html
* tested using angstrom & armv7 target & qtcreator 201005 & 2.4.0
Signed-off-by: Eric Bénard <eric@eukrea.com>
Cc: fcooper@ti.com
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 20 +++++++++++++++++++-
.../recipes-devtools/gdb/gdb-cross-canadian_7.4.bb | 2 +-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index ec0748e..b5746ce 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -4,4 +4,22 @@ DESCRIPTION = "cross-canadian gdb for ${TARGET_ARCH} target - GNU debugger"
PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
BPN = "gdb"
-DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk"
+DEPENDS = "ncurses-nativesdk expat-nativesdk gettext-nativesdk readline-nativesdk python-nativesdk"
+RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
+ python-nativesdk-codecs python-nativesdk-netclient"
+
+EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
+
+do_configure_prepend() {
+cat > ${WORKDIR}/python << EOF
+#! /bin/sh
+case "\$2" in
+ --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
+ --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
+ --exec-prefix) echo "/usr" ;;
+ *) exit 1 ;;
+esac
+exit 0
+EOF
+ chmod +x ${WORKDIR}/python
+}
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
index a4714e7..0f95c97 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
@@ -1,7 +1,7 @@
require gdb-common.inc
require gdb-cross-canadian.inc
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
EXPAT = "--with-expat"
--
1.7.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 7/7] gdb-cross-canadian: use NATIVESDK paths as it happens to be here
2012-02-23 10:42 [PATCH 0/7] Pending patches Martin Jansa
` (5 preceding siblings ...)
2012-02-23 10:43 ` [PATCH 6/7] gdb-cross-canadian: build gdb with python support Martin Jansa
@ 2012-02-23 10:43 ` Martin Jansa
6 siblings, 0 replies; 12+ messages in thread
From: Martin Jansa @ 2012-02-23 10:43 UTC (permalink / raw)
To: openembedded-core
* seems like config/config in -L was also wrong
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 7 +++++--
.../recipes-devtools/gdb/gdb-cross-canadian_7.4.bb | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
index b5746ce..1f39188 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -10,12 +10,15 @@ RDEPENDS += "python-nativesdk-core python-nativesdk-lang python-nativesdk-re \
EXTRA_OECONF_append = "--with-python=${WORKDIR}/python"
+NATIVESDK_LIBDIR = "${NATIVESDK_SDKPATHNATIVE}${libdir_nativesdk}"
+NATIVESDK_INCLUDEDIR = "${NATIVESDK_SDKPATHNATIVE}${includedir_nativesdk}"
+
do_configure_prepend() {
cat > ${WORKDIR}/python << EOF
#! /bin/sh
case "\$2" in
- --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${exec_prefix}/include/python${PYTHON_BASEVERSION}/" ;;
- --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${libdir}/python${PYTHON_BASEVERSION}/config/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
+ --includes) echo "-I${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_INCLUDEDIR}/python${PYTHON_BASEVERSION}/" ;;
+ --ldflags) echo "-L${STAGING_DIR}/${HOST_ARCH}-nativesdk${HOST_VENDOR}-${HOST_OS}${NATIVESDK_LIBDIR}/python${PYTHON_BASEVERSION}/config -lpthread -ldl -lutil -lm -lpython${PYTHON_BASEVERSION}" ;;
--exec-prefix) echo "/usr" ;;
*) exit 1 ;;
esac
diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
index 0f95c97..dbcffde 100644
--- a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
+++ b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb
@@ -1,7 +1,7 @@
require gdb-common.inc
require gdb-cross-canadian.inc
-PR = "${INC_PR}.2"
+PR = "${INC_PR}.3"
GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
EXPAT = "--with-expat"
--
1.7.8.4
^ permalink raw reply related [flat|nested] 12+ messages in thread