tbb: Disable thumb
PATCH 1/2 tbb: Disable thumb
From: Martin Jansa <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
--- meta-oe/recipes-support/tbb/tbb_4.1.bb | 8 ++++++++ 1 file changed, 8 insertions(+)
meta-oe/recipes-support/tbb/tbb_4.1.bb +8 -0
@@ -30,3 +30,11 @@ do_install() { install -m 0755 ${B}/build/linux_*_release/lib*.so* ${D}${libdir} install -m 0644 ${WORKDIR}/tbb.pc ${D}${libdir}/pkgconfig } + +# fails with thumb enabled: +# | arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb -mthumb-interwork -mfloat-abi=softfp -mfpu=neon -mtune=cortex-a9 -mcpu=cortex-a9 -D__ARM__ -D__LINUX_ARM_ARCH__=7 -funwind-tables -mvectorize-with-neon-quad -rdynamic --sysroot=/OE/sysroots/m14tv -c -MMD -DTBB_USE_DEBUG -g -O0 -DUSE_PTHREAD -fPIC -D__TBB_BUILD=1 -Wall -Wno-parentheses -Wno-non-virtual-dtor -O2 -pipe -g -feliminate-unused-debug-types -fpermissive -fvisibility-inlines-hidden -I../../src -I../../src/rml/include -I../../include ../../src/tbb/concurrent_queue.cpp +# | {standard input}: Assembler messages: +# | {standard input}:250: Error: thumb conditional instruction should be in IT block -- `strexeq r2,r3,[r4]' +# ... +# | make[1]: *** [concurrent_queue.o] Error 1 +ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
1.8.4.3
PATCH 2/2 rfkill: Fix build when WORKDIR is included in some git checkout
From: Martin Jansa <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
--- .../dont.call.git.rev-parse.on.parent.dir.patch | 31 ++++++++++++++++++++++ meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb | 3 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch
meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch new file +31 -0
@@ -0,0 +1,31 @@ +When WORKDIR is included in some other git checkout, version.sh calls git rev-parse +and it returns some description from that upper git checkout even when rfkill is +being built from release tarball. + +When returned description doesn't match with expected v0.4, version.sh exits +without creating version.c + # on git builds check that the version number above + # is correct... + [ "${descr%%-*}" = "v$VERSION" ] || exit 2 + +and build fails a bit later: + | NOTE: make -j 32 -e MAKEFLAGS= + | CC rfkill.o + | GEN version.c + | make: *** [version.c] Error 2 + | make: *** Waiting for unfinished jobs.... + | ERROR: oe_runmake failed + +Don't try git rev-parse, if there isn't .git in ${S}. + +--- a/version.sh 2013-11-15 03:43:12.587744366 -0800 ++++ b/version.sh 2013-11-15 03:42:40.699743320 -0800 +@@ -12,7 +12,7 @@ + + if test "x$SUFFIX" != 'x'; then + v="$VERSION$SUFFIX" +-elif head=`git rev-parse --verify HEAD 2>/dev/null`; then ++elif test -d .git && head=`git rev-parse --verify HEAD 2>/dev/null`; then + git update-index --refresh --unmerged > /dev/null + descr=$(git describe 2>/dev/null || echo "v$VERSION") +
meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb +2 -1
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c6036d0eb7edbfced28c4160e5d3fa94" PR = "r1" SRC_URI = "http://wireless.kernel.org/download/${PN}/${P}.tar.bz2 \ - file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch" + file://0001-rfkill-makefile-don-t-use-t-the-OE-install-wrapper-d.patch \ + file://dont.call.git.rev-parse.on.parent.dir.patch" SRC_URI[md5sum] = "727892c0fb35c80ee3849fbe89b45350" SRC_URI[sha256sum] = "ca10e4827a5f0a36e093aee6ad81b5febf81f8097d7d858889ac51ff364168c1"
Signature · 1 line
1.8.4.3