[meta-oe][for-dylan][PATCH 0/9] Dylan backports

[meta-oe][for-dylan][PATCH 0/9] Dylan backports

[Martin Jansa]

The following changes since commit 44754206632dd5b0725aeb43e99e4ff9e0245dca:

  net-snmp: Backport fix for NETSNMP_NO_SYSTEMD typos (2013-10-10 21:30:38 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib jansa/dylan-backports
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/dylan-backports

Martin Jansa (9):
  tbb: Disable thumb
  rfkill: Fix build when WORKDIR is included in some git checkout
  cifs-utils: Add PACKAGECONFIG for cifscreds, cifsupcall
  gateone: Drop allarch
  mime-support: Drop allarch
  zram: Drop allarch
  usb-modeswitch-data: Exclude SIGGEN dependency on usb-modeswitch
  fbset-modes: Explicitly set MACHINE_ARCH
  tvheadend: Disable dvdscan

 .../recipes-dvb/tvheadend/tvheadend_git.bb         |  1 +
 .../recipes-support/cifs/cifs-utils_git.bb         |  4 +++
 meta-oe/conf/layer.conf                            |  4 +++
 .../recipes-connectivity/gateone/gateone_git.bb    |  2 +-
 .../dont.call.git.rev-parse.on.parent.dir.patch    | 31 ++++++++++++++++++++++
 meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb  |  3 ++-
 meta-oe/recipes-extended/zram/zram_0.1.bb          |  5 ++--
 meta-oe/recipes-support/fbset/fbset-modes.bb       |  6 ++++-
 .../mime-support/mime-support_3.48.bb              |  1 -
 meta-oe/recipes-support/tbb/tbb_4.1.bb             |  8 ++++++
 10 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch

-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 1/9] tbb: Disable thumb

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/tbb/tbb_4.1.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta-oe/recipes-support/tbb/tbb_4.1.bb b/meta-oe/recipes-support/tbb/tbb_4.1.bb
index 96137bc..55212dc 100644
--- a/meta-oe/recipes-support/tbb/tbb_4.1.bb
+++ b/meta-oe/recipes-support/tbb/tbb_4.1.bb
@@ -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"
-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 2/9] rfkill: Fix build when WORKDIR is included in some git checkout

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../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

diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch b/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch
new file mode 100644
index 0000000..2b83689
--- /dev/null
+++ b/meta-oe/recipes-connectivity/rfkill/rfkill/dont.call.git.rev-parse.on.parent.dir.patch
@@ -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")
+ 
diff --git a/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb b/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb
index f90736d..1c2930a 100644
--- a/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb
+++ b/meta-oe/recipes-connectivity/rfkill/rfkill_0.4.bb
@@ -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"
-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 3/9] cifs-utils: Add PACKAGECONFIG for cifscreds, cifsupcall

[Martin Jansa]

From: Martin Jansa <martin.jansa@gmail.com>

* make files in bindir/sbindir a bit more deterministic

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
---
 meta-networking/recipes-support/cifs/cifs-utils_git.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-networking/recipes-support/cifs/cifs-utils_git.bb b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
index 3d15ff3..0d0f5c6 100644
--- a/meta-networking/recipes-support/cifs/cifs-utils_git.bb
+++ b/meta-networking/recipes-support/cifs/cifs-utils_git.bb
@@ -13,6 +13,10 @@ S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap"
+# when enabled, it creates ${bindir}/cifscreds and --ignore-fail-on-non-empty in do_install_append is needed
+PACKAGECONFIG[cifscreds] = "--enable-cifscreds,--disable-cifscreds,keyutils"
+# when enabled, it creates ${sbindir}/cifs.upcall and --ignore-fail-on-non-empty in do_install_append is needed
+PACKAGECONFIG[cifsupcall] = "--enable-cifsupcall,--disable-cifsupcall,krb5 talloc keyutils"
 
 inherit autotools pkgconfig
 
-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 4/9] gateone: Drop allarch

[Martin Jansa]

* runtime dependencies are TUNE_PKGARCH causing do_package_write_*
  task to have different signature for MACHINEs with different
  TUNE_PKGARCH

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/gateone/gateone_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-connectivity/gateone/gateone_git.bb b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
index e5b8527..e94376f 100644
--- a/meta-oe/recipes-connectivity/gateone/gateone_git.bb
+++ b/meta-oe/recipes-connectivity/gateone/gateone_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://github.com/liftoff/GateOne.git \
 
 S = "${WORKDIR}/git"
 
-inherit distutils allarch python-dir systemd
+inherit distutils python-dir systemd
 
 export prefix = "${localstatedir}/lib"
 
-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 5/9] mime-support: Drop allarch

[Martin Jansa]

* depends on TUNE_PKGARCH 'file'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/mime-support/mime-support_3.48.bb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb b/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
index e730102..db481e3 100644
--- a/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
+++ b/meta-oe/recipes-support/mime-support/mime-support_3.48.bb
@@ -10,7 +10,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}-1.tar.gz"
 S = "${WORKDIR}/${PN}"
 
 FILES_${PN} += " ${libdir}/mime"
-inherit allarch
 
 docdir_append = "/${PN}"
 
-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 6/9] zram: Drop allarch

[Martin Jansa]

* runtime dependencies are TUNE_PKGARCH causing do_package_write_*
  task to have different signature for MACHINEs with different
  TUNE_PKGARCH
* move kernel-module-zram to RRECOMMENDS, because signature handler
  is excluding kernel-module-* dependencies only from RRECOMMENDS and
  also because some machine can have zram enabled in kernel and
  kernel-module-zram won't exist.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/zram/zram_0.1.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/zram/zram_0.1.bb b/meta-oe/recipes-extended/zram/zram_0.1.bb
index fbeb586..02abb12 100644
--- a/meta-oe/recipes-extended/zram/zram_0.1.bb
+++ b/meta-oe/recipes-extended/zram/zram_0.1.bb
@@ -2,9 +2,10 @@ DESCRIPTION = "Linux zram compressed in-memory swap"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
 
-inherit allarch update-rc.d systemd
+inherit update-rc.d systemd
 
-RDEPENDS_${PN} = "util-linux-swaponoff kmod kernel-module-zram"
+RDEPENDS_${PN} = "util-linux-swaponoff kmod"
+RRECOMMENDS_${PN} = "kernel-module-zram"
 
 PR = "r3"
 
-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 7/9] usb-modeswitch-data: Exclude SIGGEN dependency on usb-modeswitch

[Martin Jansa]

* has runtime dependency on TUNE_PKGARCH usb-modeswitch
  Hash for dependent task usb-modeswitch_1.2.5.bb.do_packagedata changed from 5709ee415d286847b58e7b438b5b9f75 to fbef5eee3bb2bacb805a0bead2095b52

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/conf/layer.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/conf/layer.conf b/meta-oe/conf/layer.conf
index 68f7823..1a95293 100644
--- a/meta-oe/conf/layer.conf
+++ b/meta-oe/conf/layer.conf
@@ -31,3 +31,7 @@ SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   distro-feed-configs \
   ca-certificates \
 "
+
+SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
+  usb-modeswitch-data->usb-modeswitch \
+"
-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 8/9] fbset-modes: Explicitly set MACHINE_ARCH

[Martin Jansa]

* bitbake-diffsigs output:
  basehash changed from 2f6aa4302713441e9c3c7207c4edea33 to 3486f2b65998ee4ec5bd5fbbe02cadb0
  List of dependencies for variable TARGET_LD_ARCH changed from 'set([])' to 'set(['TUNE_LDARGS'])'
  List of dependencies for variable TARGET_AS_ARCH changed from 'set([])' to 'set(['TUNE_ASARGS'])'
  List of dependencies for variable TARGET_OS changed from 'set([])' to 'set(['ABIEXTENSION', 'LIBCEXTENSION'])'
  List of dependencies for variable TARGET_CC_ARCH changed from 'set([])' to 'set(['TUNE_CCARGS'])'
  List of dependencies for variable TARGET_ARCH changed from 'set([])' to 'set(['TUNE_ARCH'])'
  Dependency on Variable ABIEXTENSION was removed
  Dependency on Variable TUNE_CCARGS was removed
  Dependency on Variable TUNE_FEATURES_tune-armv5t was removed
  Dependency on Variable TUNE_FEATURES_tune-armv5te was removed
  Dependency on Variable TUNE_ARCH was removed
  Dependency on Variable LIBCEXTENSION was removed
  Dependency on Variable TUNE_FEATURES_tune-armv5 was removed
  Dependency on Variable TUNE_LDARGS was removed
  Dependency on Variable DEFAULTTUNE was removed
  Dependency on Variable TUNE_ASARGS was removed
  Dependency on Variable TUNE_FEATURES was removed
  Variable TARGET_LD_ARCH value changed from 'none' to '${TUNE_LDARGS}'
  Variable TARGET_AS_ARCH value changed from 'none' to '${TUNE_ASARGS}'
  Variable TARGET_OS value changed from 'linux' to 'linux${LIBCEXTENSION}${ABIEXTENSION}'
  Variable TARGET_CC_ARCH value changed from 'none' to '${TUNE_CCARGS}'
  Variable TARGET_ARCH value changed from 'allarch' to '${TUNE_ARCH}'
  Hash for dependent task fbset-modes.bb.do_patch changed from eb8e475b55d64d5c9f6427a90e080ba6 to ee7e89fdd852378ee18ac23cdd92f3d3
---
 meta-oe/recipes-support/fbset/fbset-modes.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb
index 03d4039..e3b26ec 100644
--- a/meta-oe/recipes-support/fbset/fbset-modes.bb
+++ b/meta-oe/recipes-support/fbset/fbset-modes.bb
@@ -13,5 +13,9 @@ do_install() {
 }
 
 inherit allarch
-CONFFILES_${PN} = "${sysconfdir}/fb.modes"
 
+# fb.modes file is MACHINE_ARCH, base.bbclass correctly changes it to MACHINE_ARCH, but too late for allarch.bbclass
+# to disable "all" behavior (found when comparing qemuarm and qemux86 signatures)
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+CONFFILES_${PN} = "${sysconfdir}/fb.modes"
-- 
1.8.4.3

[meta-oe][for-dylan][PATCH 9/9] tvheadend: Disable dvdscan

[Martin Jansa]

* when enabled it will try to download
  http://linuxtv.org/hg/dvb-apps/archive/tip.tar.bz2
  from do_configure (bypassing PREMIRROR and bitbake fetcher), but
  what's worse even when it fetches it, it fails in do_install, because
  dvb-scan directory is empty, reading the script called from configure
  3.3-r0/git/support/getmuxlist, I don't know how it could work before,
  because it first moves files to dvb-scan directory and then removes
  them all one by one.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
index 7c8b959..65d43c6 100644
--- a/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
+++ b/meta-multimedia/recipes-dvb/tvheadend/tvheadend_git.bb
@@ -20,6 +20,7 @@ do_configure() {
                 --bindir=${bindir} \
                 --datadir=${datadir} \
                 --arch=${TARGET_ARCH} \
+                --disable-dvbscan \
                 --disable-bundle
 }
 
-- 
1.8.4.3

Re: [meta-oe][for-dylan][PATCH 0/9] Dylan backports

[Koen Kooi]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Jansa schreef op 04-01-14 12:13:
> The following changes since commit
> 44754206632dd5b0725aeb43e99e4ff9e0245dca:
> 
> net-snmp: Backport fix for NETSNMP_NO_SYSTEMD typos (2013-10-10 21:30:38
> +0200)
> 
> are available in the git repository at:
> 
> git://git.openembedded.org/meta-openembedded-contrib
> jansa/dylan-backports 
> http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/dylan-backports
>
>  Martin Jansa (9): tbb: Disable thumb rfkill: Fix build when WORKDIR is
> included in some git checkout cifs-utils: Add PACKAGECONFIG for
> cifscreds, cifsupcall gateone: Drop allarch mime-support: Drop allarch 
> zram: Drop allarch usb-modeswitch-data: Exclude SIGGEN dependency on
> usb-modeswitch fbset-modes: Explicitly set MACHINE_ARCH tvheadend:
> Disable dvdscan

All these look OK to me for dylan

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFSyCVjMkyGM64RGpERAmaOAJ0QUbKWiz3CpiGkx10GjnAvteL79wCeKUGV
o6+SAXguLS6oADcWcDYdR08=
=rYts
-----END PGP SIGNATURE-----