Re: [oe] [RFC] Move libexecdir to $prefix/libexec
Forgot to cross-post oe-devel... On 23 June 2015 at 15:30, Ross Burton ross.bur...@intel.com wrote: Hi, Yes, I'm bringing this up again. :) Our default of libexecdir=$libdir/$BPN is contrary to both the FHS[1] and GNU Coding Standards[2], mainly because the key point is that libexecdir should be global and not change per-recipe. The new FHS allows /usr/libexec so this series changes the default to that, and fixes up the recipes which need fixing. Several of the recipe fixes are unrelated to the change and will be submitted to master shortly, but others (eg sudo) are intimately tied to the change. I've done basic multilib-enabled builds but more testing welcome. I'd say that in general multilib problems this exposes are in fact problems with the recipe: for example GConf should install the binaries once and libraries in each libdir. Ross [1] http://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html [2] https://www.gnu.org/prep/standards/html_node/Directory-Variables.html -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-java][PATCH] openjdk-7: fix icedtea-crosscompile-fix.patch
From ed2cca0045c597a28ce4ea3f9ce220c97a2a05fe Mon Sep 17 00:00:00 2001 From: Amy Fong amy.f...@windriver.com Date: Mon, 22 Jun 2015 14:50:20 -0400 Subject: [PATCH] openjdk-7: fix patch Fixing what looks like a hand edited patch error Signed-off-by: Amy Fong amy.f...@windriver.com --- recipes-core/openjdk/openjdk-7-75b13/icedtea-crosscompile-fix.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-core/openjdk/openjdk-7-75b13/icedtea-crosscompile-fix.patch b/recipes-core/openjdk/openjdk-7-75b13/icedtea-crosscompile-fix.patch index 250f8a4..5e8e479 100644 --- a/recipes-core/openjdk/openjdk-7-75b13/icedtea-crosscompile-fix.patch +++ b/recipes-core/openjdk/openjdk-7-75b13/icedtea-crosscompile-fix.patch @@ -139,7 +139,7 @@ index 69e1177..dc7f8e6 100644 CFLAGS_REQUIRED_hppa+= CFLAGS_REQUIRED_i586+= -fno-omit-frame-pointer -D_LITTLE_ENDIAN CFLAGS_REQUIRED_ia64+= -fno-omit-frame-pointer -D_LITTLE_ENDIAN - @@ -359,7 +337,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) +@@ -359,7 +337,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) # # -L paths for finding and -ljava # -- 2.1.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master][fido][PATCH] nodejs: fix no-registry option
From: Martin Jansa martin.ja...@lge.com * https://github.com/npm/npm/issues/3691 * https://github.com/npm/npm/issues/5509 Signed-off-by: Martin Jansa martin.ja...@lge.com --- .../nodejs/nodejs/no-registry.patch| 59 ++ meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch b/meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch new file mode 100644 index 000..ed24738 --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/no-registry.patch @@ -0,0 +1,59 @@ +Bugfix for --no-registry in nodejs-v0.12.2 + +diff -u -r node-v0.12.2_def/deps/npm/lib/cache/caching-client.js node-v0.12.2/deps/npm/lib/cache/caching-client.js +--- node-v0.12.2_def/deps/npm/lib/cache/caching-client.js 2015-04-01 01:13:01.0 +0300 node-v0.12.2/deps/npm/lib/cache/caching-client.js 2015-05-18 00:47:10.738599686 +0300 +@@ -67,6 +67,22 @@ + var cacheBase = cacheFile(npm.config.get(cache))(uri) + var cachePath = path.join(cacheBase, .cache.json) + ++ if (parsed.host === noregistry) (function() { ++var stat = null ++var file = npm.config.get(cache) + parsed.pathname + /.cache.json ++try { ++ stat = fs.statSync(cachePath) ++} catch (ex) {} ++if (!stat) try { ++ stat = fs.statSync(file) ++ cachePath = file ++} catch (ex) { ++ stat = Registry not defined and registry files not found: \ + ++ cachePath + \, \ + file + \. ++ throw new Error(stat) ++} ++ })() ++ + // If the GET is part of a write operation (PUT or DELETE), then + // skip past the cache entirely, but still save the results. + if (uri.match(/\?write=true$/)) { +@@ -83,12 +99,17 @@ + } + catch (ex) { + data = null ++ if (parsed.host === noregistry) ++throw new Error(File \ + cachePath+\ + corrupted.) + } + + params.stat = stat + params.data = data + +-get_.call(client, uri, cachePath, params, cb) ++if (parsed.host === noregistry) ++ cb(null, data, JSON.stringify(data), { statusCode : 304 }) ++else ++ get_.call(client, uri, cachePath, params, cb) + }) + } + else { +diff -u -r node-v0.12.2_def/deps/npm/lib/utils/map-to-registry.js node-v0.12.2/deps/npm/lib/utils/map-to-registry.js +--- node-v0.12.2_def/deps/npm/lib/utils/map-to-registry.js 2015-04-01 01:13:01.0 +0300 node-v0.12.2/deps/npm/lib/utils/map-to-registry.js 2015-05-18 01:15:10.030569613 +0300 +@@ -45,6 +45,8 @@ + + log.silly(mapToRegistry, registry, registry) + ++ if (!registry) return cb(null, http://noregistry/; + name, {}) ++ + var auth = config.getCredentialsByURI(registry) + + // normalize registry URL so resolution doesn't drop a piece of registry URL diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb index 81b8c0d..cc4a5ce 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.4.bb @@ -7,6 +7,7 @@ DEPENDS = openssl SRC_URI = http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \ file://enable-armv5e-build.patch \ +file://no-registry.patch \ SRC_URI[md5sum] = c2b4deea212c0b7c2f86368c65fab312 SRC_URI[sha256sum] = 3298d0997613a04ac64343e8316da134d04588132554ae402eb344e3369ec912 -- 2.4.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][master/fido/dizzy][PATCH] libssh2: upgrade to v1.6.0
Besides new features and improvements, this fixes CVE-2015-1782. License's md5 changed because of a modified copyright. Signed-off-by: Hugo Vasconcelos Saldanha hugo.salda...@aker.com.br --- .../recipes-support/libssh2/{libssh2_1.4.3.bb = libssh2_1.6.0.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta-oe/recipes-support/libssh2/{libssh2_1.4.3.bb = libssh2_1.6.0.bb} (60%) diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb similarity index 60% rename from meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb rename to meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb index b537663..022482c 100644 --- a/meta-oe/recipes-support/libssh2/libssh2_1.4.3.bb +++ b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb @@ -5,11 +5,11 @@ SECTION = libs DEPENDS = zlib openssl LICENSE = BSD -LIC_FILES_CHKSUM = file://COPYING;md5=d00afe44f336a79a2ca7e1681ce14509 +LIC_FILES_CHKSUM = file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca SRC_URI = http://www.libssh2.org/download/${BP}.tar.gz; -SRC_URI[md5sum] = 071004c60c5d6f90354ad1b701013a0b -SRC_URI[sha256sum] = eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d +SRC_URI[md5sum] = 00aabd6e714a5f42a4fb82ace20db1dd +SRC_URI[sha256sum] = 5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215 inherit autotools pkgconfig -- 2.4.4 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-ruby][PATCH] imsettings: add new recipe
-Original Message- From: openembedded-devel-boun...@lists.openembedded.org [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of Martin Jansa Sent: Tuesday, June 23, 2015 7:40 PM To: openembedded-devel@lists.openembedded.org Subject: Re: [oe] [meta-ruby][PATCH] imsettings: add new recipe On Thu, Jun 18, 2015 at 02:27:24PM +0800, Bian Naimeng wrote: imsettings is a delivery framework for general input-method configuration Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com --- .../imsettings/gtk-is-required-by-notify.patch | 18 ++ .../imsettings/imsettings_1.6.8.bb | 29 ++ 2 files changed, 47 insertions(+) create mode 100644 meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-no tify.patch create mode 100644 meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb diff --git a/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by- notify.patch b/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by- notify.patch new file mode 100644 index 000..d42358d --- /dev/null +++ b/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required +++ -by-notify.patch @@ -0,0 +1,18 @@ +gtk+ is required by linnotify. So make sure gtk be linked before +gtk+ libnotify + +Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com + +diff -Nurp imsettings-1.6.7.orig/configure.ac imsettings-1.6.7/configure.ac +--- imsettings-1.6.7.orig/configure.ac 2013-11-26 16:09:09.0 +0800 imsettings-1.6.7/configure.ac 2014-12-30 11:27:44.370003209 +0800 +@@ -93,8 +93,8 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify, + has_old_libnotify=yes + PKG_CHECK_MODULES(GTK, gtk+-2.0 = $GTK_REQUIRED) + AC_DEFINE(HAS_OLD_LIBNOTIFY,, [Using older libnotify]) +- IMDAEMON_CFLAGS=$GTK_CFLAGS $LIBNOTIFY_OLD_CFLAGS +- IMDAEMON_LIBS=$GTK_LIBS $LIBNOTIFY_OLD_LIBS],[ ++ IMDAEMON_CFLAGS=$LIBNOTIFY_OLD_CFLAGS $GTK_CFLAGS ++ IMDAEMON_LIBS=$LIBNOTIFY_OLD_LIBS $GTK_LIBS],[ + has_old_libnotify=no + IMDAEMON_CFLAGS=$LIBNOTIFY_CFLAGS + IMDAEMON_LIBS=$LIBNOTIFY_LIBS]) diff --git a/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb b/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb new file mode 100644 index 000..91443d7 --- /dev/null +++ b/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb @@ -0,0 +1,29 @@ +SUMMARY = Delivery framework for general Input Method configuration +DESCRIPTION = IMSettings is a framework that delivers Input Method \ +settings and applies the changes so they take effect \ immediately +without any need to restart applications \ or the desktop. \ This +package contains the core DBus services and some utilities. +HOMEPAGE = http://code.google.com/p/imsettings/; +SECTION = Applications/System + +inherit autotools gtk-doc + +SRC_URI = https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ + file://gtk-is-required-by-notify.patch + +SRC_URI[md5sum] = c31429f1d60e36d7f811f871c75b6c41 +SRC_URI[sha256sum] = 2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba + +LICENSE = LGPLv2+ +LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 + +EXTRA_OECONF = --with-xinputsh=50-xinput.sh \ +--disable-static \ + + +DEPENDS = gtk+ gconf libnotify dbus-glib libgxim + +RDEPENDS_${PN} += bash + +FILES_${PN} += ${datadir}/dbus-1/* Fails to build: | NOTE: Executing intltoolize --copy --force --automake | NOTE: Executing ACLOCAL=aclocal | --system-acdir=/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te- | oe-linux-gnueabi/imsettings/1.6.8-r0/build/aclocal-copy/ autoreconf | --verbose --install --force --exclude=autopoint -I | /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueab | i/imsettings/1.6.8-r0/imsettings-1.6.8/m4macros/ | autoreconf: Entering directory `.' | autoreconf: configure.ac: not using Gettext | autoreconf: running: aclocal | --system-acdir=/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te- | oe-linux-gnueabi/imsettings/1.6.8-r0/build/aclocal-copy/ -I | /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueab | i/imsettings/1.6.8-r0/imsettings-1.6.8/m4macros/ -I | /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueab | i/imsettings/1.6.8-r0/imsettings-1.6.8/m4macros/ --force \ | aclocal: error: non-option arguments are not accepted: '\'. | aclocal: Try '/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/a clocal --help' for more information. | autoreconf: aclocal failed with exit status: 1 | ERROR: autoreconf execution failed. | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_configure (log file is located at |
[oe] [meta-ruby][PATCH v2] imsettings: add new recipe
imsettings is a delivery framework for general input-method configuration Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com --- .../imsettings/gtk-is-required-by-notify.patch | 18 + ...CAL_AMFLAGS-isnot-supported-by-autoreconf.patch | 21 +++ .../imsettings/imsettings_1.6.8.bb | 30 ++ 3 files changed, 69 insertions(+) create mode 100644 meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch create mode 100644 meta-ruby/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch create mode 100644 meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb diff --git a/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch b/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch new file mode 100644 index 000..d42358d --- /dev/null +++ b/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch @@ -0,0 +1,18 @@ +gtk+ is required by linnotify. So make sure gtk be linked before libnotify + +Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com + +diff -Nurp imsettings-1.6.7.orig/configure.ac imsettings-1.6.7/configure.ac +--- imsettings-1.6.7.orig/configure.ac 2013-11-26 16:09:09.0 +0800 imsettings-1.6.7/configure.ac 2014-12-30 11:27:44.370003209 +0800 +@@ -93,8 +93,8 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify, + has_old_libnotify=yes + PKG_CHECK_MODULES(GTK, gtk+-2.0 = $GTK_REQUIRED) + AC_DEFINE(HAS_OLD_LIBNOTIFY,, [Using older libnotify]) +- IMDAEMON_CFLAGS=$GTK_CFLAGS $LIBNOTIFY_OLD_CFLAGS +- IMDAEMON_LIBS=$GTK_LIBS $LIBNOTIFY_OLD_LIBS],[ ++ IMDAEMON_CFLAGS=$LIBNOTIFY_OLD_CFLAGS $GTK_CFLAGS ++ IMDAEMON_LIBS=$LIBNOTIFY_OLD_LIBS $GTK_LIBS],[ + has_old_libnotify=no + IMDAEMON_CFLAGS=$LIBNOTIFY_CFLAGS + IMDAEMON_LIBS=$LIBNOTIFY_LIBS]) diff --git a/meta-ruby/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch b/meta-ruby/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch new file mode 100644 index 000..9e31847 --- /dev/null +++ b/meta-ruby/recipes-extended/imsettings/imsettings/multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch @@ -0,0 +1,21 @@ +multi-line ACLOCAL_AMFLAGS isn't supported by autoreconf. +It will cause configure error as follow. + + aclocal: error: non-option arguments are not accepted: '\'. + +Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com + +diff -Nurp imsettings-1.6.8.orig/Makefile.am imsettings-1.6.8/Makefile.am +--- imsettings-1.6.8.orig/Makefile.am 2013-02-08 11:33:59.0 +0900 imsettings-1.6.8/Makefile.am 2015-06-24 14:15:32.07007 +0900 +@@ -1,9 +1,7 @@ + NULL = + SUBDIRS = data imsettings imsettings-daemon backends utils po tests docs + +-ACLOCAL_AMFLAGS = \ +- -I m4macros \ +- $(NULL) ++ACLOCAL_AMFLAGS = -I m4macros $(NULL) + + CONFIGURE_DEPENDENCIES = \ + requires\ diff --git a/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb b/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb new file mode 100644 index 000..64a229b --- /dev/null +++ b/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb @@ -0,0 +1,30 @@ +SUMMARY = Delivery framework for general Input Method configuration +DESCRIPTION = IMSettings is a framework that delivers Input Method \ +settings and applies the changes so they take effect \ +immediately without any need to restart applications \ +or the desktop. \ +This package contains the core DBus services and some utilities. +HOMEPAGE = http://code.google.com/p/imsettings/; +SECTION = Applications/System + +inherit autotools gtk-doc + +SRC_URI = https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ + file://gtk-is-required-by-notify.patch \ + file://multi-line-ACLOCAL_AMFLAGS-isnot-supported-by-autoreconf.patch + +SRC_URI[md5sum] = c31429f1d60e36d7f811f871c75b6c41 +SRC_URI[sha256sum] = 2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba + +LICENSE = LGPLv2+ +LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 + +EXTRA_OECONF = --with-xinputsh=50-xinput.sh \ +--disable-static \ + + +DEPENDS = gtk+ gconf libnotify dbus-glib libgxim + +RDEPENDS_${PN} += bash + +FILES_${PN} += ${datadir}/dbus-1/* -- 1.8.4.2 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe
I don't have access to that build anymore (because it's jenkins job using tmpfs for TMPDIR, so after the build the TMPDIR is gone), but it's failing only in qemux86-64 builds, so I assume that it's finding host tdb or python directories, because it's running on 12.04 Ubuntu x86-64. Try to install tdb on your build host if it allows you to reproduce the issue, otherwise I'll try to reproduce it again in some next jenkins build. On Tue, Jun 23, 2015 at 7:47 AM, Bian, Naimeng bia...@cn.fujitsu.com wrote: -Original Message- From: openembedded-devel-boun...@lists.openembedded.org [mailto:openembedded-devel-boun...@lists.openembedded.org] On Behalf Of Martin Jansa Sent: Friday, June 19, 2015 11:57 PM To: openembedded-devel@lists.openembedded.org Subject: Re: [oe] [meta-oe][PATCH v2 3/7] libldb: add new recipe On Wed, Jun 17, 2015 at 03:49:09PM +0800, Bian Naimeng wrote: libldb is required by samba4 Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com --- .../do-not-import-target-module-in-configure.patch | 32 +++ meta-oe/recipes-support/libldb/libldb_1.1.17.bb| 45 ++ 2 files changed, 77 insertions(+) create mode 100644 meta-oe/recipes-support/libldb/libldb/do-not-import-target-module-in-c onfigure.patch create mode 100644 meta-oe/recipes-support/libldb/libldb_1.1.17.bb Fails to build in bitbake world: | Checking for system tdb = 1.2.13 : yes | ERROR: Python module pytdb of version 1.2.13 not found, and bundling | disabled | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_configure (log file is located at | /home/jenkins/oe/world/shr-core/tmp-glibc/work/core2-64-oe-linux/libld | b/1.1.17-r0/temp/log.do_configure.22697) NOTE: recipe libldb-1.1.17-r0: task do_configure: Failed ERROR: Task 25505 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-support /libldb/libldb_1.1.17.bb, do_configure) failed with exit code '1' tdb.so is provided by libtdb which is DEPEND-ed by libldb, I think it should be installed into STAGING_DIR_HOST/PYTHON_SITEPACKAGES_DIR. Because I could not reproduce it in my building, would you mind telling me whether does tdb.so exist in STAGING_DIR_HOST/PYTHON_SITEPACKAGES_DIR/ while this error was caught. Thanks Bian diff --git a/meta-oe/recipes-support/libldb/libldb/do-not-import-target-module-in -configure.patch b/meta-oe/recipes-support/libldb/libldb/do-not-import-target-module-in -configure.patch new file mode 100644 index 000..b4d522a --- /dev/null +++ b/meta-oe/recipes-support/libldb/libldb/do-not-import-target-modul +++ e-in-configure.patch @@ -0,0 +1,32 @@ +Some module can be loaded while cross compile, we jst check whether +the module exist + +Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com + +--- ldb-1.1.17.orig/buildtools/wafsamba/samba_bundled.py 2014-05-05 17:00:41.0 +0900 ldb-1.1.17/buildtools/wafsamba/samba_bundled.py2015-06-15 10:09:50.21217 +0900 +@@ -1,7 +1,7 @@ + # functions to support bundled libraries + + from Configure import conf +-import sys, Logs ++import sys, Logs, imp + from samba_utils import * + + def PRIVATE_NAME(bld, name, private_extension, private_library): +@@ -222,6 +222,16 @@ def CHECK_BUNDLED_SYSTEM_PYTHON(conf, li + m = __import__(modulename) + except ImportError: + found = False ++ ++build_arch = os.environ[BUILD_ARCH] ++host_arch = os.environ[HOST_ARCH] ++if build_arch != host_arch: ++# Some modules maybe can not be imported while cross compile ++# We just check whether the module exist ++stuff = imp.find_module(modulename, [os.environ[PYTHONPATH]]) ++if stuff != None: ++Logs.warn('Cross module[%s] has been found, but can not be loaded.' % (stuff[1])) ++found = True + else: + try: + version = m.__version__ diff --git a/meta-oe/recipes-support/libldb/libldb_1.1.17.bb b/meta-oe/recipes-support/libldb/libldb_1.1.17.bb new file mode 100644 index 000..17607f7 --- /dev/null +++ b/meta-oe/recipes-support/libldb/libldb_1.1.17.bb @@ -0,0 +1,45 @@ +SUMMARY = Hierarchical, reference counted memory pool system with destructors +HOMEPAGE = http://ldb.samba.org; +SECTION = libs +LICENSE = LGPL-3.0+ LGPL-2.1+ GPL-3.0+ + +DEPENDS += libtdb talloc libtevent libtdb +RDEPENDS_${PN} += libtevent popt libtalloc +RDEPENDS_pyldb += python libtdb libtalloc + +SRC_URI = http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ + file://do-not-import-target-module-in-configure.patch + +LIC_FILES_CHKSUM =
[oe] [meta-oe][fido][PATCH] nodejs: fix qemuarm build without thumb and drop unused patch
Signed-off-by: Martin Jansa martin.ja...@gmail.com --- ...uiltin-define-to-denote-hard-abi-when-in-.patch | 60 -- .../nodejs/nodejs/enable-armv5e-build.patch| 22 meta-oe/recipes-devtools/nodejs/nodejs_0.12.2.bb | 4 +- 3 files changed, 25 insertions(+), 61 deletions(-) delete mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch create mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/enable-armv5e-build.patch diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch deleted file mode 100644 index 6268d69..000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bf701e7cb3616631a354ed9ecbed6dd16f60c60d Mon Sep 17 00:00:00 2001 -From: Koen Kooi k...@dominion.thruhere.net -Date: Wed, 30 Jan 2013 10:43:47 +0100 -Subject: [PATCH] gcc has a builtin define to denote hard abi when in use, e.g. - when using -mfloat-abi=hard it will define __ARM_PCS_VFP to 1 and therefore - we should check that to determine which calling convention is in use and not - __VFP_FP__ which merely indicates presence of VFP unit - -The fix has been provided by Khem Raj raj.k...@gmail.com - -Upstream-Status: Forwarded - -Signed-off-by: Koen Kooi k...@dominion.thruhere.net - deps/v8/src/arm/assembler-arm.cc | 4 ++-- - deps/v8/src/platform-linux.cc| 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/deps/v8/src/arm/assembler-arm.cc b/deps/v8/src/arm/assembler-arm.cc -index 1787d15..c64ef58 100644 a/deps/v8/src/arm/assembler-arm.cc -+++ b/deps/v8/src/arm/assembler-arm.cc -@@ -71,10 +71,10 @@ static unsigned CpuFeaturesImpliedByCompiler() { - // If the compiler is allowed to use VFP then we can use VFP too in our code - // generation even when generating snapshots. ARMv7 and hardware floating - // point support implies VFPv3, see ARM DDI 0406B, page A1-6. --#if defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__VFP_FP__) \ -+#if defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__ARM_PCS_VFP) \ - !defined(__SOFTFP__) - answer |= 1u VFP3 | 1u ARMv7 | 1u VFP2; --#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__VFP_FP__) -+#endif // defined(CAN_USE_ARMV7_INSTRUCTIONS) defined(__ARM_PCS_VFP) - // !defined(__SOFTFP__) - #endif // _arm__ - -diff --git a/deps/v8/src/platform-linux.cc b/deps/v8/src/platform-linux.cc -index ed9eb79..10d1879 100644 a/deps/v8/src/platform-linux.cc -+++ b/deps/v8/src/platform-linux.cc -@@ -170,7 +170,7 @@ bool OS::ArmCpuHasFeature(CpuFeature feature) { - // calling this will return 1.0 and otherwise 0.0. - static void ArmUsingHardFloatHelper() { - asm(mov r0, #0:::r0); --#if defined(__VFP_FP__) !defined(__SOFTFP__) -+#if defined(__ARM_PCS_VFP) !defined(__SOFTFP__) - // Load 0x3ff0 into r1 using instructions available in both ARM - // and Thumb mode. - asm(mov r1, #3:::r1); -@@ -195,7 +195,7 @@ static void ArmUsingHardFloatHelper() { - #else - asm(vmov d0, r0, r1); - #endif // __thumb__ --#endif // defined(__VFP_FP__) !defined(__SOFTFP__) -+#endif // defined(__ARM_PCS_VFP) !defined(__SOFTFP__) - asm(mov r1, #0:::r1); - } - --- -1.8.1 - diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/enable-armv5e-build.patch b/meta-oe/recipes-devtools/nodejs/nodejs/enable-armv5e-build.patch new file mode 100644 index 000..cc7c9ab --- /dev/null +++ b/meta-oe/recipes-devtools/nodejs/nodejs/enable-armv5e-build.patch @@ -0,0 +1,22 @@ +Building for qemuarm without thumb enabled is using -march=armv5e which isn't +recognized here. Fix it by adding __ARM_ARCH_5E__. + +v0.12.2 branch of node doesn't seem to be affected, because it's using +different version of v8 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa martin.ja...@gmail.com + +diff -uNr node-v0.12.2/deps/v8/src/base/atomicops_internals_arm_gcc.h node-v0.12.2-fix/deps/v8/src/base/atomicops_internals_arm_gcc.h +--- node-v0.12.2/deps/v8/src/base/atomicops_internals_arm_gcc.h 2015-04-01 00:13:01.0 +0200 node-v0.12.2-fix/deps/v8/src/base/atomicops_internals_arm_gcc.h 2015-04-28 14:30:43.119509207 +0200 +@@ -156,7 +156,7 @@ + + // This tests against any known ARMv5 variant. + #elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ +- defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__) ++ defined(__ARM_ARCH_5E__) || defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__) + + // The kernel also provides a helper function to perform an atomic + // compare-and-swap operation at the hard-wired address 0x0fc0. diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.12.2.bb b/meta-oe/recipes-devtools/nodejs/nodejs_0.12.2.bb index 945d9b4..0e789f9 100644 ---
Re: [oe] [meta-ruby][PATCH] imsettings: add new recipe
On Thu, Jun 18, 2015 at 02:27:24PM +0800, Bian Naimeng wrote: imsettings is a delivery framework for general input-method configuration Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com --- .../imsettings/gtk-is-required-by-notify.patch | 18 ++ .../imsettings/imsettings_1.6.8.bb | 29 ++ 2 files changed, 47 insertions(+) create mode 100644 meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch create mode 100644 meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb diff --git a/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch b/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch new file mode 100644 index 000..d42358d --- /dev/null +++ b/meta-ruby/recipes-extended/imsettings/imsettings/gtk-is-required-by-notify.patch @@ -0,0 +1,18 @@ +gtk+ is required by linnotify. So make sure gtk be linked before libnotify + +Signed-off-by: Bian Naimeng bia...@cn.fujitsu.com + +diff -Nurp imsettings-1.6.7.orig/configure.ac imsettings-1.6.7/configure.ac +--- imsettings-1.6.7.orig/configure.ac 2013-11-26 16:09:09.0 +0800 imsettings-1.6.7/configure.ac2014-12-30 11:27:44.370003209 +0800 +@@ -93,8 +93,8 @@ PKG_CHECK_MODULES(LIBNOTIFY, libnotify, + has_old_libnotify=yes + PKG_CHECK_MODULES(GTK, gtk+-2.0 = $GTK_REQUIRED) + AC_DEFINE(HAS_OLD_LIBNOTIFY,, [Using older libnotify]) +-IMDAEMON_CFLAGS=$GTK_CFLAGS $LIBNOTIFY_OLD_CFLAGS +-IMDAEMON_LIBS=$GTK_LIBS $LIBNOTIFY_OLD_LIBS],[ ++IMDAEMON_CFLAGS=$LIBNOTIFY_OLD_CFLAGS $GTK_CFLAGS ++IMDAEMON_LIBS=$LIBNOTIFY_OLD_LIBS $GTK_LIBS],[ + has_old_libnotify=no + IMDAEMON_CFLAGS=$LIBNOTIFY_CFLAGS + IMDAEMON_LIBS=$LIBNOTIFY_LIBS]) diff --git a/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb b/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb new file mode 100644 index 000..91443d7 --- /dev/null +++ b/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb @@ -0,0 +1,29 @@ +SUMMARY = Delivery framework for general Input Method configuration +DESCRIPTION = IMSettings is a framework that delivers Input Method \ +settings and applies the changes so they take effect \ +immediately without any need to restart applications \ +or the desktop. \ +This package contains the core DBus services and some utilities. +HOMEPAGE = http://code.google.com/p/imsettings/; +SECTION = Applications/System + +inherit autotools gtk-doc + +SRC_URI = https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ + file://gtk-is-required-by-notify.patch + +SRC_URI[md5sum] = c31429f1d60e36d7f811f871c75b6c41 +SRC_URI[sha256sum] = 2620ffbf9a6dc842dbf994b4773d4fe355eb77076ccf33f726ba63f16c0d08ba + +LICENSE = LGPLv2+ +LIC_FILES_CHKSUM = file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 + +EXTRA_OECONF = --with-xinputsh=50-xinput.sh \ +--disable-static \ + + +DEPENDS = gtk+ gconf libnotify dbus-glib libgxim + +RDEPENDS_${PN} += bash + +FILES_${PN} += ${datadir}/dbus-1/* Fails to build: | NOTE: Executing intltoolize --copy --force --automake | NOTE: Executing ACLOCAL=aclocal --system-acdir=/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/imsettings/1.6.8-r0/build/aclocal-copy/ autoreconf --verbose --install --force --exclude=autopoint -I /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/imsettings/1.6.8-r0/imsettings-1.6.8/m4macros/ | autoreconf: Entering directory `.' | autoreconf: configure.ac: not using Gettext | autoreconf: running: aclocal --system-acdir=/home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/imsettings/1.6.8-r0/build/aclocal-copy/ -I /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/imsettings/1.6.8-r0/imsettings-1.6.8/m4macros/ -I /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/imsettings/1.6.8-r0/imsettings-1.6.8/m4macros/ --force \ | aclocal: error: non-option arguments are not accepted: '\'. | aclocal: Try '/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/aclocal --help' for more information. | autoreconf: aclocal failed with exit status: 1 | ERROR: autoreconf execution failed. | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_configure (log file is located at /home/jenkins/oe/world/shr-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/imsettings/1.6.8-r0/temp/log.do_configure.6158) NOTE: recipe imsettings-1.6.8-r0: task do_configure: Failed ERROR: Task 11347 (/home/jenkins/oe/world/shr-core/meta-openembedded/meta-ruby/recipes-extended/imsettings/imsettings_1.6.8.bb, do_configure) failed with exit code '1' -- 1.8.4.2 -- ___
Re: [oe] [OE-core] Future of Qt4 recipes
On 06/22/2015 03:43 AM, Burton, Ross wrote: Hi, So, Qt 4.8.7 was released last month[1]. Support for Qt4 stops at the end of 2015, and 4.8.7 is planned to be the last ever release of Qt4. It's still mandated by the long-awaited LSB 5 but I think it's fair to say that the majority of developers have moved to Qt5. So, what should we do with Qt4 moving forward?[2] I see several options: 1) There's still lots of people using Qt4 in production, please keep it in oe-core! (and revisit in six months time) 2) Move Qt4 recipes and classes to a meta-qt4 layer now so that oe-core 1.9 ships without Qt4, and anyone wanting full LSB compliance or Qt4 will need to add that layer to their distro. Personally, I vote for (2). Any other comments? #2 sounds fine. would recipes-lsb move out to its own layer too? - Armin Ross [1] https://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/ [2] https://bugzilla.yoctoproject.org/show_bug.cgi?id=7812 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] Future of Qt4 recipes
I agree with #2. Argument that it's still used by many projects shouldn't be used against layers :). On Wed, Jun 24, 2015 at 1:13 AM, akuster808 akuster...@gmail.com wrote: On 06/22/2015 03:43 AM, Burton, Ross wrote: Hi, So, Qt 4.8.7 was released last month[1]. Support for Qt4 stops at the end of 2015, and 4.8.7 is planned to be the last ever release of Qt4. It's still mandated by the long-awaited LSB 5 but I think it's fair to say that the majority of developers have moved to Qt5. So, what should we do with Qt4 moving forward?[2] I see several options: 1) There's still lots of people using Qt4 in production, please keep it in oe-core! (and revisit in six months time) 2) Move Qt4 recipes and classes to a meta-qt4 layer now so that oe-core 1.9 ships without Qt4, and anyone wanting full LSB compliance or Qt4 will need to add that layer to their distro. Personally, I vote for (2). Any other comments? #2 sounds fine. would recipes-lsb move out to its own layer too? - Armin Ross [1] https://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/ [2] https://bugzilla.yoctoproject.org/show_bug.cgi?id=7812 -- ___ Openembedded-core mailing list openembedded-c...@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel