Re: [oe] [meta-java][PATCH] javasqlite: add support
Attached please find the new PATCH. Changes against v1: diff --git a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch b/recipes-core/javasqlite/files/0 index d9f85e4..fc0da70 100644 --- a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch +++ b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch @@ -3,6 +3,8 @@ From: Feng MuDate: Fri, 27 May 2016 16:44:33 +0800 Subject: [PATCH] fix errors during cross compile +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Feng Mu --- Makefile.in | 56 +++-- diff --git a/recipes-core/javasqlite/javasqlite_20150419.bb b/recipes-core/javasqlite/javasqlite_20150419.bb index 785ac5a..d6259a9 100644 --- a/recipes-core/javasqlite/javasqlite_20150419.bb +++ b/recipes-core/javasqlite/javasqlite_20150419.bb @@ -34,6 +34,7 @@ EXTRA_OECONF = " \ EXTRA_OEMAKE = "DESTDIR=${D}" +# This dev package contains an '.so' file used for jni development INSANE_SKIP_${PN}-dev = "dev-elf" do_configure_append (){ /Feng On Wed, 2016-06-01 at 12:32 +0300, Maxin B. John wrote: > Hi, > > On Wed, Jun 01, 2016 at 09:43:42AM +0800, Feng Mu wrote: > > Javasqlite is a Java wrapper including a basic JDBC driver > > for SQLite 2/3. > > > > Signed-off-by: Feng Mu > > --- > > .../0001-fix-errors-during-cross-compile.patch | 533 > > + > > recipes-core/javasqlite/javasqlite_20150419.bb | 41 ++ > > 2 files changed, 574 insertions(+) > > create mode 100644 > > recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch > > create mode 100644 recipes-core/javasqlite/javasqlite_20150419.bb > > > > diff --git > > a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch > > b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch > > new file mode 100644 > > index 000..d9f85e4 > > --- /dev/null > > +++ > > b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch > > @@ -0,0 +1,533 @@ > > +From 7714a4c0e589f8b654e1270575512555ea4ad6c7 Mon Sep 17 00:00:00 2001 > > +From: Feng Mu > > +Date: Fri, 27 May 2016 16:44:33 +0800 > > +Subject: [PATCH] fix errors during cross compile > > Missing upstream-status > > > +Signed-off-by: Feng Mu > > +--- > > + Makefile.in | 56 +++-- > > + configure.in | 382 > > ++- > > + 2 files changed, 423 insertions(+), 14 deletions(-) > > + > > > > > + > > +SRC_URI[md5sum] = "242e384c1cd863d6996a35cf8c1c1e97" > > +SRC_URI[sha256sum] = > > "b6b26e2c1a2174f5525d904eb3ff698c3f7089f0d4b4c84cf6121da08c8d801f" > > + > > +EXTRA_OECONF = " \ > > +--with-sqlite3=${STAGING_DIR_NATIVE}/usr \ > > +--with-sqlite3-target=${STAGING_DIR_TARGET}/usr \ > > +--with-jdk=${STAGING_DIR_NATIVE}/usr/lib/jvm/icedtea7-native/ \ > > +" > > + > > +EXTRA_OEMAKE = "DESTDIR=${D}" > > + > > It will be better if we have a comment explaining the reason for using > INSANE_SKIP. > > > +INSANE_SKIP_${PN}-dev = "dev-elf" > > + > > +do_configure_append (){ > > + cp ${S}/*-libtool ${S}/libtool > > +} > > Best Regards, > Maxin >From 8cb8be3a542122e87b97ee6071d6a6abeaad158f Mon Sep 17 00:00:00 2001 From: Feng Mu Date: Wed, 1 Jun 2016 09:06:41 +0800 Subject: [PATCH] javasqlite: add support Javasqlite is a Java wrapper including a basic JDBC driver for SQLite 2/3. Signed-off-by: Feng Mu --- .../0001-fix-errors-during-cross-compile.patch | 535 + recipes-core/javasqlite/javasqlite_20150419.bb | 42 ++ 2 files changed, 577 insertions(+) create mode 100644 recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch create mode 100644 recipes-core/javasqlite/javasqlite_20150419.bb diff --git a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch new file mode 100644 index 000..fc0da70 --- /dev/null +++ b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch @@ -0,0 +1,535 @@ +From 7714a4c0e589f8b654e1270575512555ea4ad6c7 Mon Sep 17 00:00:00 2001 +From: Feng Mu +Date: Fri, 27 May 2016 16:44:33 +0800 +Subject: [PATCH] fix errors during cross compile + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Feng Mu +--- + Makefile.in | 56 +++-- + configure.in | 382 ++- + 2 files changed, 423 insertions(+), 14 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index aa46b24..c0fd87f 100644 +--- a/Makefile.in b/Makefile.in +@@ -5,9 +5,13 @@ CC = @CC@ + HOSTCC = @HOSTCC@ + LIBTOOL = ./libtool + SQLITE_INC = @SQLITE_INC@ ++SQLITE_TARGET_INC = @SQLITE_TARGET_INC@ + SQLITE_LIB
[oe] [meta-python][PATCH v2] python-tornado: add missing python2 runtime deps
Sorry about missing character in the previous version, I think this is the unmangled version of patch... --- Tornado 4.3 needs a couple more backport modules to prevent tornado/gen.py from bombing on import errors when running on python2 rather than python3.4 ImportError: No module named singledispatch ImportError: No module named backports_abc Fixed by creating python-singledispatch and python-backports-abc recipes respectively and adding them to RDEPENDS. Signed-off-by: S. Lockwood-Childs--- .../python/python-backports-abc_0.4.bb | 18 ++ .../python/python-singledispatch_3.4.0.3.bb| 13 + .../recipes-devtools/python/python-tornado_4.3.bb | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python-backports-abc_0.4.bb create mode 100644 meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb diff --git a/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb b/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb new file mode 100644 index 000..6a4d267 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb @@ -0,0 +1,18 @@ +SUMMARY = "collections.abc from Python 3.4" +DESCRIPTION = "A backport of recent additions to the 'collections.abc' module" + +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" + +# pypi package doesn't have valid entry for license +SRC_URI += "https://raw.githubusercontent.com/cython/backports_abc/master/LICENSE;name=license; + +SRC_URI[md5sum] = "0b65a216ce9dc9c1a7e20a729dd7c05b" +SRC_URI[sha256sum] = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5" +SRC_URI[license.md5sum] = "dd98d01d471fac8d8dbdd975229dba03" +SRC_URI[license.sha256sum] = "0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca" + + + +PYPI_PACKAGE = "backports_abc" +inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb b/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb new file mode 100644 index 000..87f46e5 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "functools.singledispatch from Python 3.4" +DESCRIPTION = "PEP 443 proposed to expose a mechanism in the functools standard library module \ +in Python 3.4 that provides a simple form of generic programming known as single-dispatch \ +generic functions. This library is a backport of this functionality to Python 2.6 - 3.3" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=ee3cd67264adc7eb07981f3644dc17dc" + +SRC_URI[md5sum] = "af2fc6a3d6cc5a02d0bf54d909785fcb" +SRC_URI[sha256sum] = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c" + +PYPI_PACKAGE = "singledispatch" +inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-tornado_4.3.bb b/meta-python/recipes-devtools/python/python-tornado_4.3.bb index 55a48b8..d30f88f 100644 --- a/meta-python/recipes-devtools/python/python-tornado_4.3.bb +++ b/meta-python/recipes-devtools/python/python-tornado_4.3.bb @@ -1,3 +1,3 @@ inherit pypi setuptools require python-tornado.inc -RDEPENDS_${PN} += "${PYTHON_PN}-backports-ssl" +RDEPENDS_${PN} += "${PYTHON_PN}-backports-ssl ${PYTHON_PN}-backports-abc ${PYTHON_PN}-singledispatch" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-python][PATCH] python-tornado: add missing python2 runtime deps
Tornado 4.3 needs a couple more backport modules to prevent tornado/gen.py from bombing on import errors when running on python2 rather than python3.4 ImportError: No module named singledispatch ImportError: No module named backports_abc Fixed by creating python-singledispatch and python-backports-abc recipes respectively and adding them to RDEPENDS. Signed-off-by: S. Lockwood-Childs--- .../python/python-backports-abc_0.4.bb | 18 ++ .../python/python-singledispatch_3.4.0.3.bb| 13 + .../recipes-devtools/python/python-tornado_4.3.bb | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python-backports-abc_0.4.bb create mode 100644 meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb diff --git a/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb b/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb new file mode 100644 index 000..6a4d267 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-backports-abc_0.4.bb @@ -0,0 +1,18 @@ +SUMMARY = "collections.abc from Python 3.4" +DESCRIPTION = "A backport of recent additions to the 'collections.abc' module" + +LICENSE = "PSF" +LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=dd98d01d471fac8d8dbdd975229dba03" + +# pypi package doesn't have valid entry for license +SRC_URI += "https://raw.githubusercontent.com/cython/backports_abc/master/LICENSE;name=license; + +SRC_URI[md5sum] = "0b65a216ce9dc9c1a7e20a729dd7c05b" +SRC_URI[sha256sum] = "8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5" +SRC_URI[license.md5sum] = "dd98d01d471fac8d8dbdd975229dba03" +SRC_URI[license.sha256sum] = "0a4f3b38055f50f047a42521568fa6ddb9a5976c2884f6ae138796d0f71150ca" + + + +PYPI_PACKAGE = "backports_abc" +inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb b/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb new file mode 100644 index 000..87f46e5 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-singledispatch_3.4.0.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "functools.singledispatch from Python 3.4" +DESCRIPTION = "PEP 443 proposed to expose a mechanism in the functools standard library module \ +in Python 3.4 that provides a simple form of generic programming known as single-dispatch \ +generic functions. This library is a backport of this functionality to Python 2.6 - 3.3" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://README.rst;md5=ee3cd67264adc7eb07981f3644dc17dc" + +SRC_URI[md5sum] = "af2fc6a3d6cc5a02d0bf54d909785fcb" +SRC_URI[sha256sum] = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c" + +PYPI_PACKAGE = "singledispatch" +inherit pypi setuptools diff --git a/meta-python/recipes-devtools/python/python-tornado_4.3.bb b/meta-python/recipes-devtools/python/python-tornado_4.3.bb index 55a48b8..d30f88f 100644 --- a/meta-python/recipes-devtools/python/python-tornado_4.3.bb +++ b/meta-python/recipes-devtools/python/python-tornado_4.3.bb @@ -1,3 +1,3 @@ inherit pypi setuptools require python-tornado.inc -RDEPENDS_${PN} += "${PYTHON_PN}-backports-ssl" +RDEPENDS_${PN} += "${PYTHON_PN}-backports-ssl ${PYTHON_P}-backports-abc ${PYTHON_PN}-singledispatch" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] opencv: Reorder PACKAGES variable
On Wed, Jun 1, 2016 at 10:13 AM, Ricardo Ribalda Delgadowrote: > PACKAGES content order is important, because it determines the > destination of the files, when the folders overlaps. > > Without this patch: > > NOTE: Executing RunQueue Tasks > ERROR: QA Issue: non debug package contains .debug directory: > opencv-apps path > packages-split/opencv-apps/usr/share/OpenCV/java/.debug/libopencv_java310.so > [debug-files] > WARNING: QA Issue: opencv-apps: found library in wrong location: > /usr/share/OpenCV/java/libopencv_java310.so > opencv-apps: found library in wrong location: > /usr/share/OpenCV/java/.debug/libopencv_java310.so [libdir] > ERROR: QA run found fatal errors. Please consider fixing them. > ERROR: Function failed: do_package_qa > > Fixes: 3132af1d1d15 ("opencv: Fix metapkg dependencies for opencv-java ... ") Empty line here, please. > Signed-off-by: Ricardo Ribalda Delgado Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] opencv: Make gphoto2 dep optional via PACKAGECONFIG
On Wed, Jun 1, 2016 at 9:33 AM, Ricardo Ribalda Delgadowrote: > Opencv can build without support for gphoto2 if needed. > > Signed-off-by: Ricardo Ribalda Delgado Acked-by: Otavio Salvador -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] opencv: Reorder PACKAGES variable
PACKAGES content order is important, because it determines the destination of the files, when the folders overlaps. Without this patch: NOTE: Executing RunQueue Tasks ERROR: QA Issue: non debug package contains .debug directory: opencv-apps path packages-split/opencv-apps/usr/share/OpenCV/java/.debug/libopencv_java310.so [debug-files] WARNING: QA Issue: opencv-apps: found library in wrong location: /usr/share/OpenCV/java/libopencv_java310.so opencv-apps: found library in wrong location: /usr/share/OpenCV/java/.debug/libopencv_java310.so [libdir] ERROR: QA run found fatal errors. Please consider fixing them. ERROR: Function failed: do_package_qa Fixes: 3132af1d1d15 ("opencv: Fix metapkg dependencies for opencv-java ... ") Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv_3.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 512f1b3dea9b..83a300e44801 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -80,8 +80,8 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" TARGET_CC_ARCH += "-I${S}/include " -PACKAGES += "${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv \ - ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)}" +PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)} \ + ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" python populate_packages_prepend () { cv_libdir = d.expand('${libdir}') -- 2.8.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] opencv: Make gphoto2 dep optional via PACKAGECONFIG
Opencv can build without support for gphoto2 if needed. Signed-off-by: Ricardo Ribalda Delgado--- meta-oe/recipes-support/opencv/opencv_3.1.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index 789512f9e0ac..512f1b3dea9b 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -10,7 +10,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEFAULT_PREFERENCE = "-1" -DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp libgphoto2 protobuf protobuf-native" +DEPENDS = "python-numpy libtool swig swig-native python bzip2 zlib glib-2.0 libwebp protobuf protobuf-native" SRCREV_opencv = "92387b1ef8fad15196dd5f7fb4931444a68bc93a" SRCREV_contrib = "5409d5ad560523c85c6796cc5a009347072d883c" @@ -54,6 +54,7 @@ PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l gstreamer samples tbb \ PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen," +PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0 gstreamer1.0-plugins-base," PACKAGECONFIG[gtk] = "-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3," PACKAGECONFIG[jasper] = "-DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper," -- 2.8.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH] javasqlite: add support
Hi, On Wed, Jun 01, 2016 at 09:43:42AM +0800, Feng Mu wrote: > Javasqlite is a Java wrapper including a basic JDBC driver > for SQLite 2/3. > > Signed-off-by: Feng Mu> --- > .../0001-fix-errors-during-cross-compile.patch | 533 > + > recipes-core/javasqlite/javasqlite_20150419.bb | 41 ++ > 2 files changed, 574 insertions(+) > create mode 100644 > recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch > create mode 100644 recipes-core/javasqlite/javasqlite_20150419.bb > > diff --git > a/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch > b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch > new file mode 100644 > index 000..d9f85e4 > --- /dev/null > +++ b/recipes-core/javasqlite/files/0001-fix-errors-during-cross-compile.patch > @@ -0,0 +1,533 @@ > +From 7714a4c0e589f8b654e1270575512555ea4ad6c7 Mon Sep 17 00:00:00 2001 > +From: Feng Mu > +Date: Fri, 27 May 2016 16:44:33 +0800 > +Subject: [PATCH] fix errors during cross compile Missing upstream-status > +Signed-off-by: Feng Mu > +--- > + Makefile.in | 56 +++-- > + configure.in | 382 > ++- > + 2 files changed, 423 insertions(+), 14 deletions(-) > + > + > +SRC_URI[md5sum] = "242e384c1cd863d6996a35cf8c1c1e97" > +SRC_URI[sha256sum] = > "b6b26e2c1a2174f5525d904eb3ff698c3f7089f0d4b4c84cf6121da08c8d801f" > + > +EXTRA_OECONF = " \ > +--with-sqlite3=${STAGING_DIR_NATIVE}/usr \ > +--with-sqlite3-target=${STAGING_DIR_TARGET}/usr \ > +--with-jdk=${STAGING_DIR_NATIVE}/usr/lib/jvm/icedtea7-native/ \ > +" > + > +EXTRA_OEMAKE = "DESTDIR=${D}" > + It will be better if we have a comment explaining the reason for using INSANE_SKIP. > +INSANE_SKIP_${PN}-dev = "dev-elf" > + > +do_configure_append (){ > + cp ${S}/*-libtool ${S}/libtool > +} Best Regards, Maxin -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel