Pending patches
cover Pending patches
You can consider sdk/gdb-cross-canadian as RFC and sstatesig.py will be probably better fixed by extending SIGGEN_EXCLUDERECIPES_ABISAFE
The following changes since commit 55f72b98f606c1554eb6edd151292ffdfddf1384:
texi2html: Fix for multilib (2012-02-22 23:01:45 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/pull
Eric BENARD (1):
gdb-cross-canadian: build gdb with python support
Martin Jansa (6):
wireless-tools: remove ldconfig call from install-libs bitbake.conf: use weak assignment for BB_CONSOLELOG
sstatesig: add pointercal-xinput to excluded machine specific configs
python: add Makefile to SSTATE_SCAN_FILES
bitbake.conf: introduce SDK_NAME_PREFIX and NATIVESDK_* variables
gdb-cross-canadian: use NATIVESDK paths as it happens to be here
meta/conf/bitbake.conf | 16 ++++++++++++- meta/lib/oe/sstatesig.py | 2 +- .../wireless-tools/remove.ldconfig.call.patch | 19 ++++++++++++++++ .../wireless-tools/wireless-tools_29.bb | 5 ++- meta/recipes-devtools/gdb/gdb-cross-canadian.inc | 23 +++++++++++++++++++- .../recipes-devtools/gdb/gdb-cross-canadian_7.4.bb | 2 +- meta/recipes-devtools/python/python_2.7.2.bb | 1 + 7 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch
Signature · 1 line
1.7.8.4
PATCH 1/7 wireless-tools: remove ldconfig call from install-libs
* and drop apply=yes param as it's not needed
--- .../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
meta/recipes-connectivity/wireless-tools/wireless-tools/remove.ldconfig.call.patch new file +19 -0
@@ -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)
meta/recipes-connectivity/wireless-tools/wireless-tools_29.bb +3 -2
@@ -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"
Signature · 1 line
1.7.8.4
PATCH 2/7 bitbake.conf: use weak assignment for BB_CONSOLELOG
* some people prefer subdirectory like /cooker/.log
--- meta/conf/bitbake.conf | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
meta/conf/bitbake.conf +2 -1
@@ -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"
Signature · 1 line
1.7.8.4
Re: [PATCH 2/7] bitbake.conf: use weak assignment for BB_CONSOLELOG
Quoted 1 line · Martin Jansa
* some people prefer subdirectory like /cooker/.log
I think we should probably change that to the default actually...
Cheers,
Richard
Quoted 19 lines
Signed-off-by Martin Jansa <[email protected]>--- meta/conf/bitbake.conf | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)meta/conf/bitbake.conf +2
-1@@ -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"
Re: [PATCH 2/7] bitbake.conf: use weak assignment for BB_CONSOLELOG
Quoted 4 lines · Richard Purdie
Quoted 1 line · Martin Jansa
* 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,
Quoted 30 lines
Cheers,
Richard
Quoted 10 lines
Signed-off-by Martin Jansa <[email protected]>--- meta/conf/bitbake.conf | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)meta/conf/bitbake.conf +0
-0meta/conf/bitbake.conf DISTRO[unexport] = "1" · line 730
Quoted 9 lines
meta/conf/bitbake.conf +2
-1@@ -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
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 3/7 sstatesig: add pointercal-xinput to excluded machine specific configs
In reply to Martin Jansa* it's used by xinput-calibrator in meta-oe but contains just calibration data like pointercal does for tslib
--- meta/lib/oe/sstatesig.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/lib/oe/sstatesig.py +1 -1
@@ -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
Signature · 1 line
1.7.8.4
Re: [PATCH 3/7] sstatesig: add pointercal-xinput to excluded machine specific configs
Quoted 12 lines · Martin Jansa
* it's used by xinput-calibrator in meta-oe but contains just calibration data like pointercal does for tslib
Signed-off-by Martin Jansa<[email protected]>--- meta/lib/oe/sstatesig.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)meta/lib/oe/sstatesig.py +0
-0
meta/lib/oe/sstatesig.py def sstate_rundepfilter(fn, recipename, task, dep, depname): · line 33
Quoted 8 lines
meta/lib/oe/sstatesig.py +1
-1@@ -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!
Re: [PATCH 3/7] sstatesig: add pointercal-xinput to excluded machine specific configs
Quoted 20 lines · Saul Wold
Quoted 19 lines · Martin Jansa
* it's used by xinput-calibrator in meta-oe but contains just calibration data like pointercal does for tslib
Signed-off-by Martin Jansa<[email protected]>--- meta/lib/oe/sstatesig.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)meta/lib/oe/sstatesig.py +1
-1@@ -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
Quoted 4 lines
meta/lib/oe/sstatesig.py def sstate_rundepfilter(fn, recipename, task, dep, depname): · line 33
Quoted 1 line
meta/lib/oe/sstatesig.py +0
-0# Default to keep dependenciesThis patch needs to be re-based to use RP's new
SIGGEN_EXCLUDERECIPES_ABISAFEvariable in layer.conf
Patch adding this to meta-oe's SIGGEN_EXCLUDERECIPES_ABISAFE was already sent, so ignore this one.
Cheers,
Quoted 3 lines
Thanks
Sau!
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
PATCH 4/7 python: add Makefile to SSTATE_SCAN_FILES
In reply to Martin Jansa* 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)
--- meta/recipes-devtools/python/python_2.7.2.bb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-devtools/python/python_2.7.2.bb +1 -0
@@ -100,6 +100,7 @@ do_install() { fi } +SSTATE_SCAN_FILES += "Makefile" PACKAGE_PREPROCESS_FUNCS += "py_package_preprocess" py_package_preprocess () {
Signature · 1 line
1.7.8.4
PATCH 5/7 bitbake.conf: introduce SDK_NAME_PREFIX and NATIVESDK_* variables
In reply to Martin Jansa--- meta/conf/bitbake.conf | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-)
meta/conf/bitbake.conf +12 -1
@@ -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.
Signature · 1 line
1.7.8.4
PATCH 6/7 gdb-cross-canadian: build gdb with python support
In reply to Martin JansaFrom: Eric BENARD <[email protected]>
* 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
--- 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(-)
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +19 -1
@@ -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 +}
meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb +1 -1
@@ -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"
Signature · 1 line
1.7.8.4
PATCH 7/7 gdb-cross-canadian: use NATIVESDK paths as it happens to be here
In reply to Martin Jansa* seems like config/config in -L was also wrong
--- 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(-)
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +5 -2
@@ -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
meta/recipes-devtools/gdb/gdb-cross-canadian_7.4.bb +1 -1
@@ -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"
Signature · 1 line
1.7.8.4