[oe] [meta-oe][PATCH 1/2] mariadb.inc: switch to a different, working mirror
The current mirror doesn't have mariadb 5.x anymore.
Signed-off-by: Koen Kooi koen.k...@linaro.org
---
meta-oe/recipes-support/mysql/mariadb.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc
b/meta-oe/recipes-support/mysql/mariadb.inc
index d2418e7..a11924a 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -3,8 +3,7 @@ HOMEPAGE = http://mariadb.org;
SECTION = libs
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-
-SRC_URI =
http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-${PV}.tar.gz
\
+SRC_URI =
http://mirrors.supportex.net/mariadb/mariadb-${PV}/source/mariadb-${PV}.tar.gz
\
file://fix-cmake-module-path.patch \
file://remove-bad-path.patch \
file://fix-mysqlclient-r-version.patch \
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [OE-core] [PATCH] Opencv: Add OpenCV 3.0
You are right :) I repack and send On Wed, Aug 19, 2015 at 4:00 PM, Nathan Lynch nathan_ly...@mentor.com wrote: On 08/19/2015 07:18 AM, Ricardo Ribalda Delgado wrote: --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb @@ -0,0 +1,128 @@ +SUMMARY = Opencv : The Open Computer Vision Library +HOMEPAGE = http://opencv.willowgarage.com/wiki/; Is this URL outdated? It times out for me. -- Ricardo Ribalda -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2] [meta-oe] opencv: Add OpenCV 3.0
Hello Martin
Sorry for the (extremely) late reply, somehow my mail client managed
to hide your mail.
Thank you very much for your review, I am working on a v3 of the patch.
Regards!
On Fri, Jul 3, 2015 at 5:27 PM, Martin Jansa martin.ja...@gmail.com wrote:
On Tue, Jun 09, 2015 at 04:13:09PM +0200, Ricardo Ribalda Delgado wrote:
-Support for new PACKAGECONFIGS
-Merge with opencv-samples
Since it is not backward compatible with 2.x and cannot be installed in
parallel it has a DEFAULT_PREFERENCE of -1.
Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com
---
meta-oe/recipes-support/opencv/opencv_3.0.bb | 127
+++
1 file changed, 127 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv_3.0.bb
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb
b/meta-oe/recipes-support/opencv/opencv_3.0.bb
new file mode 100644
index ..60a96af1fe68
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -0,0 +1,127 @@
+SUMMARY = Opencv : The Open Computer Vision Library
+HOMEPAGE = http://opencv.willowgarage.com/wiki/;
+SECTION = libs
+
+LICENSE = BSD
+LIC_FILES_CHKSUM =
file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14
+
+ARM_INSTRUCTION_SET = arm
+
+DEPENDS = python-numpy libtool swig swig-native python bzip2 zlib glib-2.0
oracle-jse-jdk ant
meta-oe doesn't depend on meta-java layer, so this cannot be added here
ERROR: Nothing PROVIDES 'oracle-jse-jdk' (but
/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.0.bb
DEPENDS on or otherwise requires it)
ERROR: Nothing PROVIDES 'ant' (but
/home/jenkins/oe/world/shr-core/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.0.bb
DEPENDS on or otherwise requires it). Close matches:
Is it possible to disable java part with PACKAGECONFIG?
+
+DEFAULT_PREFERENCE = -1
+
+SRCREV_opencv = 424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69
+SRCREV_contrib = 844c30e8b2f2f4b34b96a169fafe9beea3c45e87
+SRCREV_FORMAT = opencv
+SRC_URI = git://github.com/Itseez/opencv.git;nobranch=1;name=opencv \
+
git://github.com/Itseez/opencv_contrib.git;nobranch=1;destsuffix=contrib;name=contrib
Don't use nobranch=1 when it's not needed:
OE @ ~/projects/opencv $ git branch -a --contains
424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69
* master
remotes/origin/HEAD - origin/master
remotes/origin/master
OE @ ~/projects/opencv $ cd ../opencv_contrib/
OE @ ~/projects/opencv_contrib $ git branch -a --contains
844c30e8b2f2f4b34b96a169fafe9beea3c45e87
* master
remotes/origin/HEAD - origin/master
remotes/origin/master
+
+PV = 3.0+git${SRCPV}
+
+S = ${WORKDIR}/git
+
+EXTRA_OECMAKE =
-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include
\
+ -DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
+ -DWITH_1394=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ ${@bb.utils.contains(TARGET_CC_ARCH, -msse3,
-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1, , d)} \
+ ${@base_conditional(libdir, /usr/lib64,
-DLIB_SUFFIX=64, , d)} \
+ ${@base_conditional(libdir, /usr/lib32,
-DLIB_SUFFIX=32, , d)} \
+
+
+PACKAGECONFIG ??= eigen jpeg libav png tiff v4l tbb samples\
+ ${@bb.utils.contains(DISTRO_FEATURES, x11, gtk,
, d)}
+PACKAGECONFIG[eigen] = -DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,
+PACKAGECONFIG[gtk] = -DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,
+PACKAGECONFIG[jpeg] = -DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,
+PACKAGECONFIG[libav] = -DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,
+PACKAGECONFIG[png] = -DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,
+PACKAGECONFIG[tiff] = -DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,
+PACKAGECONFIG[v4l] = -DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,
+PACKAGECONFIG[jasper] = -DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,
+PACKAGECONFIG[amdblas] =
-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,
+PACKAGECONFIG[amdfft] =
-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,
+PACKAGECONFIG[opencl] = -DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,
+PACKAGECONFIG[gstreamer] =
-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0
gstreamer1.0-plugins-base,
+PACKAGECONFIG[oracle-java-amd64] =
-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so
-DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,oracle-jse-jdk
ant,
+PACKAGECONFIG[samples] = -DBUILD_EXAMPLES=ON
-DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,
+PACKAGECONFIG[tbb] = -DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,
+
+inherit distutils-base pkgconfig cmake
+
+export BUILD_SYS
+export HOST_SYS
+export PYTHON_CSPEC=-I${STAGING_INCDIR}/${PYTHON_DIR}
+export
[oe] [PATCH] Opencv: Add OpenCV 3.0
-Support for new PACKAGECONFIGS
-Merge with opencv-samples
Since it is not backward compatible with 2.x and cannot be installed in
parallel it has a DEFAULT_PREFERENCE of -1.
Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com
---
v3: Changes requested by Martin Jansa martin.ja...@gmail.com
-Select java dependencies via packageconfig
meta-oe/recipes-support/opencv/opencv_3.0.bb | 128 +++
1 file changed, 128 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv_3.0.bb
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb
b/meta-oe/recipes-support/opencv/opencv_3.0.bb
new file mode 100644
index ..e929f82c8762
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -0,0 +1,128 @@
+SUMMARY = Opencv : The Open Computer Vision Library
+HOMEPAGE = http://opencv.willowgarage.com/wiki/;
+SECTION = libs
+
+LICENSE = BSD
+LIC_FILES_CHKSUM =
file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14
+
+ARM_INSTRUCTION_SET = arm
+
+DEFAULT_PREFERENCE = -1
+
+DEPENDS = python-numpy libtool swig swig-native python bzip2 zlib glib-2.0
+
+SRCREV_opencv = 424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69
+SRCREV_contrib = 844c30e8b2f2f4b34b96a169fafe9beea3c45e87
+SRCREV_FORMAT = opencv
+SRC_URI = git://github.com/Itseez/opencv.git;name=opencv \
+
git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib
+
+PV = 3.0+git${SRCPV}
+
+S = ${WORKDIR}/git
+
+EXTRA_OECMAKE =
-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include
\
+-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
+ -DWITH_1394=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ ${@bb.utils.contains(TARGET_CC_ARCH, -msse3,
-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1, , d)} \
+ ${@base_conditional(libdir, /usr/lib64,
-DLIB_SUFFIX=64, , d)} \
+ ${@base_conditional(libdir, /usr/lib32,
-DLIB_SUFFIX=32, , d)} \
+
+
+PACKAGECONFIG ??= eigen jpeg libav png tiff v4l gstreamer samples tbb\
+ ${@bb.utils.contains(DISTRO_FEATURES, x11, gtk, ,
d)}
+PACKAGECONFIG[eigen] = -DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,
+PACKAGECONFIG[gtk] = -DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,
+PACKAGECONFIG[jpeg] = -DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,
+PACKAGECONFIG[libav] = -DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,
+PACKAGECONFIG[png] = -DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,
+PACKAGECONFIG[tiff] = -DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,
+PACKAGECONFIG[v4l] = -DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,
+PACKAGECONFIG[jasper] = -DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,
+PACKAGECONFIG[amdblas] =
-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,
+PACKAGECONFIG[amdfft] =
-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,
+PACKAGECONFIG[opencl] = -DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,
+PACKAGECONFIG[gstreamer] =
-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0
gstreamer1.0-plugins-base,
+PACKAGECONFIG[oracle-java] = -DJAVA_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so
-DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native
oracle-jse-jdk oracle-jse-jdk-native,
+PACKAGECONFIG[samples] = -DBUILD_EXAMPLES=ON
-DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,
+PACKAGECONFIG[tbb] = -DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,
+
+inherit distutils-base pkgconfig cmake
+
+export BUILD_SYS
+export HOST_SYS
+export PYTHON_CSPEC=-I${STAGING_INCDIR}/${PYTHON_DIR}
+export PYTHON=${STAGING_BINDIR_NATIVE}/python
+export JAVA_HOME=${STAGING_DIR_NATIVE}/usr/bin/java
+export ANT_DIR=${STAGING_DIR_NATIVE}/usr/share/ant/
+
+TARGET_CC_ARCH += -I${S}/include
+
+PACKAGES += ${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples
${PN}-apps python-opencv
+
+python populate_packages_prepend () {
+cv_libdir = d.expand('${libdir}')
+cv_libdir_dbg = d.expand('${libdir}/.debug')
+do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev', allow_links=True)
+do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev')
+do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev')
+do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s
library', extra_depends='', allow_links=True)
+
+pn = d.getVar('PN', 1)
+metapkg = pn + '-dev'
+d.setVar('ALLOW_EMPTY_' + metapkg, 1)
+blacklist = [ metapkg ]
+metapkg_rdepends = [ ]
+packages = d.getVar('PACKAGES', 1).split()
+for pkg in packages[1:]:
+if not pkg in blacklist and not pkg in metapkg_rdepends and
pkg.endswith('-dev'):
+
[oe] [meta-oe][PATCHv2 1/2] mariadb.inc: switch to a different, working mirror
The current mirror doesn't have mariadb 5.x anymore.
Signed-off-by: Koen Kooi koen.k...@linaro.org
---
meta-oe/recipes-support/mysql/mariadb.inc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc
b/meta-oe/recipes-support/mysql/mariadb.inc
index d2418e7..a11924a 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -3,8 +3,7 @@ HOMEPAGE = http://mariadb.org;
SECTION = libs
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=751419260aa954499f7abaabaa882bbe
-
-SRC_URI =
http://mirror.stshosting.co.uk/mariadb/mariadb-${PV}/source/mariadb-${PV}.tar.gz
\
+SRC_URI =
http://mirrors.supportex.net/mariadb/mariadb-${PV}/source/mariadb-${PV}.tar.gz
\
file://fix-cmake-module-path.patch \
file://remove-bad-path.patch \
file://fix-mysqlclient-r-version.patch \
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] mariadb: update to 5.5.45
This is the latest release in the 5.5.x stable series. The CVE patch has been
applied upstream.
Signed-off-by: Koen Kooi koen.k...@linaro.org
---
...b-native_5.5.43.bb = mariadb-native_5.5.45.bb} | 0
meta-oe/recipes-support/mysql/mariadb.inc | 5 +--
.../mysql/mariadb/fix-CVE-2015-2305.patch | 43 --
.../mysql/{mariadb_5.5.43.bb = mariadb_5.5.45.bb} | 0
4 files changed, 2 insertions(+), 46 deletions(-)
rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.43.bb =
mariadb-native_5.5.45.bb} (100%)
delete mode 100644
meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
rename meta-oe/recipes-support/mysql/{mariadb_5.5.43.bb = mariadb_5.5.45.bb}
(100%)
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb
b/meta-oe/recipes-support/mysql/mariadb-native_5.5.45.bb
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.45.bb
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc
b/meta-oe/recipes-support/mysql/mariadb.inc
index a11924a..e265a7d 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -11,11 +11,10 @@ SRC_URI =
http://mirrors.supportex.net/mariadb/mariadb-${PV}/source/mariadb-${P
file://mysqld.service \
file://configure.cmake-fix-valgrind.patch \
file://fix-a-building-failure.patch \
- file://fix-CVE-2015-2305.patch \
-SRC_URI[md5sum] = c8760d6b5890fc1de76c07af48092c88
-SRC_URI[sha256sum] =
a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01
+SRC_URI[md5sum] = 6ec397f717f6e2e4e9154e76de9ec9fc
+SRC_URI[sha256sum] =
4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0
S = ${WORKDIR}/mariadb-${PV}
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
b/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
deleted file mode 100644
index 2d1b467..000
--- a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f5c1d00a9ceb61acfe038dcf2ec0236c2939328c Mon Sep 17 00:00:00 2001
-From: Roy Li rongqing...@windriver.com
-Date: Mon, 1 Jun 2015 15:31:48 +0800
-Subject: [PATCH] From 70bc2965604b6b8aaf260049e64c708dddf85334 Mon Sep 17
- 00:00:00 2001 From: Gary Houston ghous...@arglist.com Date: Wed, 25 Feb
- 2015 13:29:03 +1100 Subject: [PATCH] Bug fix for integer overflow in regcomp
- for excessively long pattern strings. CERT Vulnerability Note VU#695940.
- Found by Guido Vranken.
-
-Upsteam-Status: Backport
-
-https://bugzilla.suse.com/attachment.cgi?id=627001
-
-Signed-off-by: Roy Li rongqing...@windriver.com
- regex/regcomp.c | 11 ++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/regex/regcomp.c b/regex/regcomp.c
-index abc1817..31e57c1 100644
a/regex/regcomp.c
-+++ b/regex/regcomp.c
-@@ -138,7 +138,16 @@ struct cclass cclasses[CCLASS_LAST+1]= {
- (NC-1)*sizeof(cat_t));
- if (g == NULL)
- return(REG_ESPACE);
-- p-ssize = (long) (len/(size_t)2*(size_t)3 + (size_t)1); /* ugh */
-+ {
-+/* Patched for CERT Vulnerability Note VU#695940, Feb 2015. */
-+size_t new_ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */
-+if (new_ssize len || new_ssize LONG_MAX / sizeof(sop)) {
-+ free((char *) g);
-+ return REG_INVARG;
-+}
-+p-ssize = new_ssize;
-+ }
-+
- p-strip = (sop *)malloc(p-ssize * sizeof(sop));
- p-slen = 0;
- if (p-strip == NULL) {
---
-1.9.1
-
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.43.bb
b/meta-oe/recipes-support/mysql/mariadb_5.5.45.bb
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.43.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.45.bb
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-java][PATCH 1/3] Don't depend on a hardcoded compiler
This patch creates a circular dependency for me: ERROR: Unbuildable tasks were found. These are usually caused by circular dependencies and any circular dependency chains found will be printed below. Increase the debug level to see a list of unbuildable tasks. Identifying dependency loops (this may take a short while)... ERROR: Dependency loop #1 found: Task 2 (virtual:native:/sources/meta-java/recipes-core/jamvm/jamvm_git.bb, do_install) (dependent Tasks ['jamvm, do_compile']) Task 3 (virtual:native:/sources/meta-java/recipes-core/jamvm/jamvm_git.bb, do_populate_sysroot) (dependent Tasks ['jamvm, do_install']) Task 68 (/sources/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb, do_configure) (dependent Tasks ['libecj-bootstrap-native, do_populate_sysroot', 'ecj-bootstrap-native.bb, do_patch', 'jamvm, do_populate_sysroot']) Task 69 (/sources/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb, do_compile) (dependent Tasks ['ecj-bootstrap-native.bb, do_configure']) Task 65 (/sources/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb, do_install) (dependent Tasks ['ecj-bootstrap-native.bb, do_compile']) Task 66 (/sources/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb, do_populate_sysroot) (dependent Tasks ['ecj-bootstrap-native.bb, do_install']) Task 5 (virtual:native:/sources/meta-java/recipes-core/jamvm/jamvm_git.bb, do_configure) (dependent Tasks ['jamvm, do_patch', 'ecj-bootstrap-native.bb, do_populate_sysroot', 'libtool-native, do_populate_sysroot', 'libffi, do_populate_sysroot', 'gnu-config, do_populate_sysroot', 'pkgconfig, do_populate_sysroot', 'zlib, do_populate_sysroot', 'autoconf, do_populate_sysroot', 'classpath-native, do_populate_sysroot', 'automake, do_populate_sysroot']) Task 6 (virtual:native:/sources/meta-java/recipes-core/jamvm/jamvm_git.bb, do_compile) (dependent Tasks ['jamvm, do_configure']) Dependency loop #2 found: Task 2 (virtual:native:/sources/meta-java/recipes-core/jamvm/jamvm_git.bb, do_install) (dependent Tasks ['jamvm, do_compile']) Task 3 (virtual:native:/sources/meta-java/recipes-core/jamvm/jamvm_git.bb, do_populate_sysroot) (dependent Tasks ['jamvm, do_install']) Task 68 (/sources/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb, do_configure) (dependent Tasks ['libecj-bootstrap-native, do_populate_sysroot', 'ecj-bootstrap-native.bb, do_patch', 'jamvm, do_populate_sysroot']) Task 69 (/sources/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb, do_compile) (dependent Tasks ['ecj-bootstrap-native.bb, do_configure']) Task 65 (/sources/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb, do_install) (dependent Tasks ['ecj-bootstrap-native.bb, do_compile']) Task 66 (/sources/meta-java/recipes-core/ecj/ecj-bootstrap-native.bb, do_populate_sysroot) (dependent Tasks ['ecj-bootstrap-native.bb, do_install']) Task 61 (/sources/meta-java/recipes-core/classpath/classpath-native_0.99.bb, do_configure) (dependent Tasks ['ecj-bootstrap-native.bb, do_populate_sysroot', 'libtool-native, do_populate_sysroot', 'gettext-minimal-native, do_populate_sysroot', 'gnu-config, do_populate_sysroot', 'zip, do_populate_sysroot', 'fastjar, do_populate_sysroot', 'autoconf, do_populate_sysroot', 'classpath-native, do_patch', 'automake, do_populate_sysroot']) Task 62 (/sources/meta-java/recipes-core/classpath/classpath-native_0.99.bb, do_compile) (dependent Tasks ['classpath-native, do_configure']) Task 58 (/sources/meta-java/recipes-core/classpath/classpath-native_0.99.bb, do_install) (dependent Tasks ['classpath-native, do_compile']) Task 59 (/sources/meta-java/recipes-core/classpath/classpath-native_0.99.bb, do_populate_sysroot) (dependent Tasks ['classpath-native, do_install']) Task 5 (virtual:native:/sources/meta-java/recipes-core/jamvm/jamvm_git.bb, do_configure) (dependent Tasks ['jamvm, do_patch', 'ecj-bootstrap-native.bb, do_populate_sysroot', 'libtool-native, do_populate_sysroot', 'libffi, do_populate_sysroot', 'gnu-config, do_populate_sysroot', 'pkgconfig, do_populate_sysroot', 'zlib, do_populate_sysroot', 'autoconf, do_populate_sysroot', 'classpath-native, do_populate_sysroot', 'automake, do_populate_sysroot']) Task 6 (virtual:native:/sources/meta-java/recipes-core/jamvm/jamvm_git.bb, do_compile) (dependent Tasks ['jamvm, do_configure']) I have set PREFERRED_PROVIDER_virtual/java-native = jamvm-native and PREFERRED_PROVIDER_virtual/javac-native = ecj-bootstrap-native The recipe ecj-bootstrap-native now depends on virtual/java-native and provides virtual/javac-native. The recipe jamvm depends on virtual/javac-native and provides java-native. So none of them can be built since this patch. Shouldn't jamvm depend on javac-initial-native? Mit freundlichen Grüßen, Sven Ebenfeld 2015-08-18 22:14 GMT+02:00 Mario Domenech Goulart ma...@ossystems.com.br: The recipes below depended on a hardcoded native compile (ecj-initial-native). Since we may use another native compiler to build them, we set the dependency in virtual/javac-native instead. *
Re: [oe] [meta-oe][meta-multimedia][PATCH 2/2] vlc: update to 2.2.1
On Wed, Aug 19, 2015 at 08:14:16AM +0200, Rafaël Carré wrote:
On 08/19/2015 05:05 AM, Tim Orling wrote:
On Tue, Aug 18, 2015 at 2:44 AM, Martin Jansa martin.ja...@gmail.com
wrote:
On Sun, Aug 02, 2015 at 06:07:57PM -0700, Tim Orling wrote:
I accidentally left libvorbis as a dependency in vlc.inc, which is not
needed (tremor provides what was needed).
You can pull the corrected recipes from:
http://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/vlc-2.2.1
--Tim
It still fails with that libtool error:
http://errors.yoctoproject.org/Errors/Details/14498/
but I'll merge it anyway, because it doesn't make things worse than old
version.
It is having a problem with the assembly files (e.g.
vlc-2.2.1/modules/arm_neon/i422_yuyv.S )
Anybody have any ideas? I would guess that --tag=CC would still apply, but
I don't see any obvious support for assembly files in the libtool docs.
--Tim
This vlc.inc diff lets VLC build correctly for me:
-sed -i -e s:'${top_builddir_slash}libtool':${TARGET_SYS}-libtool:g
${B}/doltlibtool
+sed -i -e
s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g
${B}/doltlibtool
Can you please send this as proper patch? Then I'll include it in next
jenkins build to verify.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH v4] Opencv: Add OpenCV 3.0
-Support for new PACKAGECONFIGS
-Merge with opencv-samples
Since it is not backward compatible with 2.x and cannot be installed in
parallel it has a DEFAULT_PREFERENCE of -1.
Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com
---
v4: Fix suggested by Nathan Lynch nathan_ly...@mentor.com
Wrong url on HOMEPAGE
meta-oe/recipes-support/opencv/opencv_3.0.bb | 128 +++
1 file changed, 128 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv_3.0.bb
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb
b/meta-oe/recipes-support/opencv/opencv_3.0.bb
new file mode 100644
index ..36ab6271edd6
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -0,0 +1,128 @@
+SUMMARY = Opencv : The Open Computer Vision Library
+HOMEPAGE = http://opencv.org/;
+SECTION = libs
+
+LICENSE = BSD
+LIC_FILES_CHKSUM =
file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14
+
+ARM_INSTRUCTION_SET = arm
+
+DEFAULT_PREFERENCE = -1
+
+DEPENDS = python-numpy libtool swig swig-native python bzip2 zlib glib-2.0
+
+SRCREV_opencv = 424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69
+SRCREV_contrib = 844c30e8b2f2f4b34b96a169fafe9beea3c45e87
+SRCREV_FORMAT = opencv
+SRC_URI = git://github.com/Itseez/opencv.git;name=opencv \
+
git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib
+
+PV = 3.0+git${SRCPV}
+
+S = ${WORKDIR}/git
+
+EXTRA_OECMAKE =
-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include
\
+-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
+ -DWITH_1394=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ ${@bb.utils.contains(TARGET_CC_ARCH, -msse3,
-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1, , d)} \
+ ${@base_conditional(libdir, /usr/lib64,
-DLIB_SUFFIX=64, , d)} \
+ ${@base_conditional(libdir, /usr/lib32,
-DLIB_SUFFIX=32, , d)} \
+
+
+PACKAGECONFIG ??= eigen jpeg libav png tiff v4l gstreamer samples tbb\
+ ${@bb.utils.contains(DISTRO_FEATURES, x11, gtk, ,
d)}
+PACKAGECONFIG[eigen] = -DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,
+PACKAGECONFIG[gtk] = -DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,
+PACKAGECONFIG[jpeg] = -DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,
+PACKAGECONFIG[libav] = -DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,
+PACKAGECONFIG[png] = -DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,
+PACKAGECONFIG[tiff] = -DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,
+PACKAGECONFIG[v4l] = -DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,
+PACKAGECONFIG[jasper] = -DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,
+PACKAGECONFIG[amdblas] =
-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,
+PACKAGECONFIG[amdfft] =
-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,
+PACKAGECONFIG[opencl] = -DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,
+PACKAGECONFIG[gstreamer] =
-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0
gstreamer1.0-plugins-base,
+PACKAGECONFIG[oracle-java] = -DJAVA_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so
-DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native
oracle-jse-jdk oracle-jse-jdk-native,
+PACKAGECONFIG[samples] = -DBUILD_EXAMPLES=ON
-DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,
+PACKAGECONFIG[tbb] = -DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,
+
+inherit distutils-base pkgconfig cmake
+
+export BUILD_SYS
+export HOST_SYS
+export PYTHON_CSPEC=-I${STAGING_INCDIR}/${PYTHON_DIR}
+export PYTHON=${STAGING_BINDIR_NATIVE}/python
+export JAVA_HOME=${STAGING_DIR_NATIVE}/usr/bin/java
+export ANT_DIR=${STAGING_DIR_NATIVE}/usr/share/ant/
+
+TARGET_CC_ARCH += -I${S}/include
+
+PACKAGES += ${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples
${PN}-apps python-opencv
+
+python populate_packages_prepend () {
+cv_libdir = d.expand('${libdir}')
+cv_libdir_dbg = d.expand('${libdir}/.debug')
+do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev', allow_links=True)
+do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev')
+do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev')
+do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s
library', extra_depends='', allow_links=True)
+
+pn = d.getVar('PN', 1)
+metapkg = pn + '-dev'
+d.setVar('ALLOW_EMPTY_' + metapkg, 1)
+blacklist = [ metapkg ]
+metapkg_rdepends = [ ]
+packages = d.getVar('PACKAGES', 1).split()
+for pkg in packages[1:]:
+if not pkg in blacklist and not pkg in metapkg_rdepends and
pkg.endswith('-dev'):
+metapkg_rdepends.append(pkg)
+d.setVar('RRECOMMENDS_'
[oe] [meta-oe][PATCHv2 2/2] mariadb: update to 5.5.45
This is the latest release in the 5.5.x stable series. The CVE patch has been
applied upstream.
Signed-off-by: Koen Kooi koen.k...@linaro.org
---
...b-native_5.5.43.bb = mariadb-native_5.5.45.bb} | 0
meta-oe/recipes-support/mysql/mariadb.inc | 17 +
.../mysql/mariadb/fix-CVE-2015-2305.patch | 43 --
.../mysql/{mariadb_5.5.43.bb = mariadb_5.5.45.bb} | 0
4 files changed, 9 insertions(+), 51 deletions(-)
rename meta-oe/recipes-support/mysql/{mariadb-native_5.5.43.bb =
mariadb-native_5.5.45.bb} (100%)
delete mode 100644
meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
rename meta-oe/recipes-support/mysql/{mariadb_5.5.43.bb = mariadb_5.5.45.bb}
(100%)
diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb
b/meta-oe/recipes-support/mysql/mariadb-native_5.5.45.bb
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb-native_5.5.43.bb
rename to meta-oe/recipes-support/mysql/mariadb-native_5.5.45.bb
diff --git a/meta-oe/recipes-support/mysql/mariadb.inc
b/meta-oe/recipes-support/mysql/mariadb.inc
index a11924a..b40c581 100644
--- a/meta-oe/recipes-support/mysql/mariadb.inc
+++ b/meta-oe/recipes-support/mysql/mariadb.inc
@@ -11,11 +11,10 @@ SRC_URI =
http://mirrors.supportex.net/mariadb/mariadb-${PV}/source/mariadb-${P
file://mysqld.service \
file://configure.cmake-fix-valgrind.patch \
file://fix-a-building-failure.patch \
- file://fix-CVE-2015-2305.patch \
-SRC_URI[md5sum] = c8760d6b5890fc1de76c07af48092c88
-SRC_URI[sha256sum] =
a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01
+SRC_URI[md5sum] = 6ec397f717f6e2e4e9154e76de9ec9fc
+SRC_URI[sha256sum] =
4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0
S = ${WORKDIR}/mariadb-${PV}
@@ -87,11 +86,13 @@ do_compile_prepend_class-target () {
cp ${STAGING_BINDIR_NATIVE}/comp_sql ${S}/scripts
if [ ${@bb.utils.contains('PACKAGECONFIG', 'krb5', 'yes', 'no', d)} =
no ]; then
-mkdir ${B}/include/openssl
-echo #ifndef KSSL_H ${B}/include/openssl/kssl.h
-echo #define KSSL_H ${B}/include/openssl/kssl.h
-echo #include openssl/opensslconf.h${B}/include/openssl/kssl.h
-echo #endif ${B}/include/openssl/kssl.h
+if ! [ -e ${B}/include/openssl/kssl.h ] ; then
+mkdir -p ${B}/include/openssl
+echo #ifndef KSSL_H ${B}/include/openssl/kssl.h
+echo #define KSSL_H ${B}/include/openssl/kssl.h
+echo #include
openssl/opensslconf.h${B}/include/openssl/kssl.h
+echo #endif ${B}/include/openssl/kssl.h
+fi
fi
}
diff --git a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
b/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
deleted file mode 100644
index 2d1b467..000
--- a/meta-oe/recipes-support/mysql/mariadb/fix-CVE-2015-2305.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f5c1d00a9ceb61acfe038dcf2ec0236c2939328c Mon Sep 17 00:00:00 2001
-From: Roy Li rongqing...@windriver.com
-Date: Mon, 1 Jun 2015 15:31:48 +0800
-Subject: [PATCH] From 70bc2965604b6b8aaf260049e64c708dddf85334 Mon Sep 17
- 00:00:00 2001 From: Gary Houston ghous...@arglist.com Date: Wed, 25 Feb
- 2015 13:29:03 +1100 Subject: [PATCH] Bug fix for integer overflow in regcomp
- for excessively long pattern strings. CERT Vulnerability Note VU#695940.
- Found by Guido Vranken.
-
-Upsteam-Status: Backport
-
-https://bugzilla.suse.com/attachment.cgi?id=627001
-
-Signed-off-by: Roy Li rongqing...@windriver.com
- regex/regcomp.c | 11 ++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/regex/regcomp.c b/regex/regcomp.c
-index abc1817..31e57c1 100644
a/regex/regcomp.c
-+++ b/regex/regcomp.c
-@@ -138,7 +138,16 @@ struct cclass cclasses[CCLASS_LAST+1]= {
- (NC-1)*sizeof(cat_t));
- if (g == NULL)
- return(REG_ESPACE);
-- p-ssize = (long) (len/(size_t)2*(size_t)3 + (size_t)1); /* ugh */
-+ {
-+/* Patched for CERT Vulnerability Note VU#695940, Feb 2015. */
-+size_t new_ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */
-+if (new_ssize len || new_ssize LONG_MAX / sizeof(sop)) {
-+ free((char *) g);
-+ return REG_INVARG;
-+}
-+p-ssize = new_ssize;
-+ }
-+
- p-strip = (sop *)malloc(p-ssize * sizeof(sop));
- p-slen = 0;
- if (p-strip == NULL) {
---
-1.9.1
-
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.5.43.bb
b/meta-oe/recipes-support/mysql/mariadb_5.5.45.bb
similarity index 100%
rename from meta-oe/recipes-support/mysql/mariadb_5.5.43.bb
rename to meta-oe/recipes-support/mysql/mariadb_5.5.45.bb
--
2.1.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
Re: [oe] [OE-core] [PATCH v4] Opencv: Add OpenCV 3.0
Hi Ricardo,
Firstly can you please not send patches to the openembedded-core mailing list
that aren't for OE-Core? I probably don't need to be CC'd on every patch
either unless it's a recipe I've worked on.
A couple of other comments below.
On Wednesday 19 August 2015 16:07:54 Ricardo Ribalda Delgado wrote:
-Support for new PACKAGECONFIGS
-Merge with opencv-samples
Since it is not backward compatible with 2.x and cannot be installed in
parallel it has a DEFAULT_PREFERENCE of -1.
Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com
---
v4: Fix suggested by Nathan Lynch nathan_ly...@mentor.com
Wrong url on HOMEPAGE
meta-oe/recipes-support/opencv/opencv_3.0.bb | 128
+++ 1 file changed, 128 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv_3.0.bb
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb
b/meta-oe/recipes-support/opencv/opencv_3.0.bb new file mode 100644
index ..36ab6271edd6
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -0,0 +1,128 @@
+SUMMARY = Opencv : The Open Computer Vision Library
+HOMEPAGE = http://opencv.org/;
+SECTION = libs
+
+LICENSE = BSD
I realise this is in the older recipe, but can you change this to be more
specific i.e. BSD-2-Clause, BSD-3-Clause, etc.
+LIC_FILES_CHKSUM =
file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932
466bb14 +
+ARM_INSTRUCTION_SET = arm
+
+DEFAULT_PREFERENCE = -1
+
+DEPENDS = python-numpy libtool swig swig-native python bzip2 zlib
glib-2.0 +
+SRCREV_opencv = 424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69
+SRCREV_contrib = 844c30e8b2f2f4b34b96a169fafe9beea3c45e87
+SRCREV_FORMAT = opencv
+SRC_URI = git://github.com/Itseez/opencv.git;name=opencv \
+
git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib
+
+PV = 3.0+git${SRCPV}
+
+S = ${WORKDIR}/git
+
+EXTRA_OECMAKE =
-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-pac
kages/numpy/core/include \ +
-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
+ -DWITH_1394=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ ${@bb.utils.contains(TARGET_CC_ARCH, -msse3,
-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1, , d)}
\ + ${@base_conditional(libdir, /usr/lib64,
-DLIB_SUFFIX=64, , d)} \ +
${@base_conditional(libdir, /usr/lib32, -DLIB_SUFFIX=32, , d)} \ +
+
+PACKAGECONFIG ??= eigen jpeg libav png tiff v4l gstreamer samples tbb\
+ ${@bb.utils.contains(DISTRO_FEATURES, x11, gtk,
, d)} +PACKAGECONFIG[eigen] =
-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen, +PACKAGECONFIG[gtk] =
-DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,
+PACKAGECONFIG[jpeg] = -DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,
+PACKAGECONFIG[libav] = -DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,
+PACKAGECONFIG[png] = -DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,
+PACKAGECONFIG[tiff] = -DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,
+PACKAGECONFIG[v4l] = -DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,
+PACKAGECONFIG[jasper] = -DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,
+PACKAGECONFIG[amdblas] =
-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,
+PACKAGECONFIG[amdfft] =
-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,
+PACKAGECONFIG[opencl] =
-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,
+PACKAGECONFIG[gstreamer] =
-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0
gstreamer1.0-plugins-base, +PACKAGECONFIG[oracle-java] =
-DJAVA_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so
-DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native
oracle-jse-jdk oracle-jse-jdk-native, +PACKAGECONFIG[samples] =
-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,
+PACKAGECONFIG[tbb] = -DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,
+
+inherit distutils-base pkgconfig cmake
+
+export BUILD_SYS
+export HOST_SYS
+export PYTHON_CSPEC=-I${STAGING_INCDIR}/${PYTHON_DIR}
+export PYTHON=${STAGING_BINDIR_NATIVE}/python
+export JAVA_HOME=${STAGING_DIR_NATIVE}/usr/bin/java
+export ANT_DIR=${STAGING_DIR_NATIVE}/usr/share/ant/
+
+TARGET_CC_ARCH += -I${S}/include
+
+PACKAGES += ${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples
${PN}-apps python-opencv +
+python populate_packages_prepend () {
+cv_libdir = d.expand('${libdir}')
+cv_libdir_dbg = d.expand('${libdir}/.debug')
+do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV
%s development package', extra_depends='${PN}-dev', allow_links=True) +
do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev') +do_split_packages(d,
cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s development package',
extra_depends='${PN}-dev') +
[oe] [meta-oe][PATCH v5] Opencv: Add OpenCV 3.0
-Support for new PACKAGECONFIGS
-Merge with opencv-samples
Since it is not backward compatible with 2.x and cannot be installed in
parallel it has a DEFAULT_PREFERENCE of -1.
Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com
---
v5: Fix suggested by Paul Eggleton paul.eggle...@linux.intel.com
-Update license
-remove unused INSANE_SKIP line
meta-oe/recipes-support/opencv/opencv_3.0.bb | 127 +++
1 file changed, 127 insertions(+)
create mode 100644 meta-oe/recipes-support/opencv/opencv_3.0.bb
diff --git a/meta-oe/recipes-support/opencv/opencv_3.0.bb
b/meta-oe/recipes-support/opencv/opencv_3.0.bb
new file mode 100644
index ..479f48e410a3
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv_3.0.bb
@@ -0,0 +1,127 @@
+SUMMARY = Opencv : The Open Computer Vision Library
+HOMEPAGE = http://opencv.org/;
+SECTION = libs
+
+LICENSE = BSD-3-Clause
+LIC_FILES_CHKSUM =
file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14
+
+ARM_INSTRUCTION_SET = arm
+
+DEFAULT_PREFERENCE = -1
+
+DEPENDS = python-numpy libtool swig swig-native python bzip2 zlib glib-2.0
+
+SRCREV_opencv = 424c2bddb39dae97dc4639a24eaa0e0c8fbb8e69
+SRCREV_contrib = 844c30e8b2f2f4b34b96a169fafe9beea3c45e87
+SRCREV_FORMAT = opencv
+SRC_URI = git://github.com/Itseez/opencv.git;name=opencv \
+
git://github.com/Itseez/opencv_contrib.git;destsuffix=contrib;name=contrib
+
+PV = 3.0+git${SRCPV}
+
+S = ${WORKDIR}/git
+
+EXTRA_OECMAKE =
-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include
\
+-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
+ -DWITH_1394=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ ${@bb.utils.contains(TARGET_CC_ARCH, -msse3,
-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1, , d)} \
+ ${@base_conditional(libdir, /usr/lib64,
-DLIB_SUFFIX=64, , d)} \
+ ${@base_conditional(libdir, /usr/lib32,
-DLIB_SUFFIX=32, , d)} \
+
+
+PACKAGECONFIG ??= eigen jpeg libav png tiff v4l gstreamer samples tbb\
+ ${@bb.utils.contains(DISTRO_FEATURES, x11, gtk, ,
d)}
+PACKAGECONFIG[eigen] = -DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen,
+PACKAGECONFIG[gtk] = -DWITH_GTK=ON,-DWITH_GTK=OFF,gtk+3,
+PACKAGECONFIG[jpeg] = -DWITH_JPEG=ON,-DWITH_JPEG=OFF,jpeg,
+PACKAGECONFIG[libav] = -DWITH_FFMPEG=ON,-DWITH_FFMPEG=OFF,libav,
+PACKAGECONFIG[png] = -DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,
+PACKAGECONFIG[tiff] = -DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,
+PACKAGECONFIG[v4l] = -DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,
+PACKAGECONFIG[jasper] = -DWITH_JASPER=ON,-DWITH_JASPER=OFF,jasper,
+PACKAGECONFIG[amdblas] =
-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,
+PACKAGECONFIG[amdfft] =
-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,
+PACKAGECONFIG[opencl] = -DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers,
+PACKAGECONFIG[gstreamer] =
-DWITH_GSTREAMER=ON,-DWITH_GSTREAMER=OFF,gstreamer1.0
gstreamer1.0-plugins-base,
+PACKAGECONFIG[oracle-java] = -DJAVA_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_INCLUDE_PATH2=${JAVA_HOME}/include/linux
-DJAVA_AWT_INCLUDE_PATH=${JAVA_HOME}/include
-DJAVA_AWT_LIBRARY=${JAVA_HOME}/lib/amd64/libjawt.so
-DJAVA_JVM_LIBRARY=${JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native
oracle-jse-jdk oracle-jse-jdk-native,
+PACKAGECONFIG[samples] = -DBUILD_EXAMPLES=ON
-DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,
+PACKAGECONFIG[tbb] = -DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,
+
+inherit distutils-base pkgconfig cmake
+
+export BUILD_SYS
+export HOST_SYS
+export PYTHON_CSPEC=-I${STAGING_INCDIR}/${PYTHON_DIR}
+export PYTHON=${STAGING_BINDIR_NATIVE}/python
+export JAVA_HOME=${STAGING_DIR_NATIVE}/usr/bin/java
+export ANT_DIR=${STAGING_DIR_NATIVE}/usr/share/ant/
+
+TARGET_CC_ARCH += -I${S}/include
+
+PACKAGES += ${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples
${PN}-apps python-opencv
+
+python populate_packages_prepend () {
+cv_libdir = d.expand('${libdir}')
+cv_libdir_dbg = d.expand('${libdir}/.debug')
+do_split_packages(d, cv_libdir, '^lib(.*)\.so$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev', allow_links=True)
+do_split_packages(d, cv_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev')
+do_split_packages(d, cv_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'OpenCV %s
development package', extra_depends='${PN}-dev')
+do_split_packages(d, cv_libdir, '^lib(.*)\.so\.*', 'lib%s', 'OpenCV %s
library', extra_depends='', allow_links=True)
+
+pn = d.getVar('PN', 1)
+metapkg = pn + '-dev'
+d.setVar('ALLOW_EMPTY_' + metapkg, 1)
+blacklist = [ metapkg ]
+metapkg_rdepends = [ ]
+packages = d.getVar('PACKAGES', 1).split()
+for pkg in packages[1:]:
+if not pkg in blacklist and not pkg in metapkg_rdepends and
pkg.endswith('-dev'):
+
[oe] [meta-oe][PATCH] opencv_2.4: Update HOMEPAGE
Old link is dead ricardo@neopili:~$ wget http://opencv.willowgarage.com/wiki/ --2015-08-19 17:12:44-- http://opencv.willowgarage.com/wiki/ Resolving opencv.willowgarage.com (opencv.willowgarage.com)... 70.35.54.199 Connecting to opencv.willowgarage.com (opencv.willowgarage.com)|70.35.54.199|:80... failed: Connection timed out. Retrying. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- meta-oe/recipes-support/opencv/opencv_2.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index 570de3109a74..733fe44cc53c 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -1,5 +1,5 @@ SUMMARY = Opencv : The Open Computer Vision Library -HOMEPAGE = http://opencv.willowgarage.com/wiki/; +HOMEPAGE = http://opencv.org/; SECTION = libs LICENSE = BSD-3-Clause -- 2.5.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] opencv_2.4: Update LICENSE
LICENSE file at the root of the opencv repo says: License Agreement For Open Source Computer Vision Library (3-clause BSD License) Credits-to: Paul Eggleton paul.eggle...@linux.intel.com Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com --- meta-oe/recipes-support/opencv/opencv_2.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta-oe/recipes-support/opencv/opencv_2.4.bb index 75441fd0c92c..ca378d7abc1e 100644 --- a/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -2,7 +2,7 @@ SUMMARY = Opencv : The Open Computer Vision Library HOMEPAGE = http://opencv.willowgarage.com/wiki/; SECTION = libs -LICENSE = BSD +LICENSE = BSD-3-Clause LIC_FILES_CHKSUM = file://include/opencv2/opencv.hpp;endline=41;md5=6d690d8488a6fca7a2c192932466bb14 ARM_INSTRUCTION_SET = arm -- 2.5.0 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 2/2] opencv_2.4: Remove unused INSANE_SKIP line
Credits-to: Paul Eggleton paul.eggle...@linux.intel.com
Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com
---
meta-oe/recipes-support/opencv/opencv_2.4.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_2.4.bb
b/meta-oe/recipes-support/opencv/opencv_2.4.bb
index ca378d7abc1e..570de3109a74 100644
--- a/meta-oe/recipes-support/opencv/opencv_2.4.bb
+++ b/meta-oe/recipes-support/opencv/opencv_2.4.bb
@@ -84,7 +84,6 @@ FILES_${PN}-doc = ${datadir}/OpenCV/doc
ALLOW_EMPTY_${PN} = 1
-INSANE_SKIP_python-opencv = True
SUMMARY_python-opencv = Python bindings to opencv
FILES_python-opencv = ${PYTHON_SITEPACKAGES_DIR}/*
RDEPENDS_python-opencv = python-core python-numpy
--
2.5.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] netcf: support multilib builds
[Re: [oe] [meta-networking][PATCH] netcf: support multilib builds] On 15.08.18
(Tue 11:33) Rongqing Li wrote:
On 2015年08月18日 11:24, Joe MacDonald wrote:
When doing a multilib build, /usr/lib is still created but not collected
into FILES_${PN} by default, resulting in a QA error. Adding both
${libdir} and ${nonarch_libdir} catches all scenarios.
It also turns out that the previous do_install_append would throw an error
in a multilib build since systemd always installs to .../lib/... but
${libdir] would point at .../lib64/...
Signed-off-by: Joe MacDonald joe_macdon...@mentor.com
---
meta-networking/recipes-support/netcf/netcf_git.bb | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb
b/meta-networking/recipes-support/netcf/netcf_git.bb
index d47bb3b..8a8963e 100644
--- a/meta-networking/recipes-support/netcf/netcf_git.bb
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -32,12 +32,22 @@ do_configure_prepend() {
do_install_append() {
if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false',
d)}; then
install -d ${D}${systemd_unitdir}/system
- mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
- rm -rf ${D}${libdir}/systemd/
+ if [ -d ${D}${libdir}/systemd/system ]; then
+ mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
+ rm -rf ${D}${libdir}/systemd/
+ else
+ mv ${D}${nonarch_libdir}/systemd/system/*
${D}${systemd_unitdir}/system/
+ rm -rf ${D}${nonarch_libdir}/systemd/
+ fi
else
mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir}
rm -rf ${D}${sysconfdir}/rc.d/
fi
}
+FILES_${PN} += \
+${libdir} \
+${nonarch_libdir} \
+
+
a similar fix has been submitted,
【oe] [PATCH][meta-networking] netcf: align the systemd file path with
Makefile
I looked at that fix but from what I can tell it unconditionally deletes
the 32-bit netcf shared and static libs in a multilib configuration.
That squelches the QA warning, but it's probably not what we want.
-J.
－Roy
SYSTEMD_SERVICE_${PN} = netcf-transaction.service
--
Best Reagrds,
Roy | RongQing Li
--
-Joe MacDonald.
:wq
signature.asc
Description: Digital signature
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] inetutils: 1.9.2 - 1.9.4
[[oe] [meta-networking][PATCH] inetutils: 1.9.2 - 1.9.4] On 15.08.12 (Wed
10:05) kai.k...@windriver.com wrote:
From: Kai Kang kai.k...@windriver.com
Upgrade inetutils from 1.9.2 to 1.9.4.
You don't appear to be working against the meta-openembedded tree on
this, I got a merge conflict on:
diff --git
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnetd-Fix-deadlock-on-cleanup.patch
b/meta-networking/recipes-connectivity/inetutils/inetutils/telnetd-Fix-deadlock-on-cleanup.patch
similarity index 100%
rename from
meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/telnetd-Fix-deadlock-on-cleanup.patch
rename to
meta-networking/recipes-connectivity/inetutils/inetutils/telnetd-Fix-deadlock-on-cleanup.patch
Which, after a bit of head-scratching, suggests your tree has this patch
merged:
http://patchwork.openembedded.org/patch/96727/
but, based on this discussion (also recorded in patchwork):
http://comments.gmane.org/gmane.comp.handhelds.openembedded/69654
we rejected it.
Anyway, I've resolved it and am merging the result. Please try to
ensure you're working on the current up-stream tree, though.
-J.
* add homepage
* update inetutils/version.patch
Signed-off-by: Kai Kang kai.k...@windriver.com
---
.../inetutils/{inetutils-1.9.2 = inetutils}/fix-disable-ipv6.patch | 0
...tils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch | 0
.../{inetutils-1.9.2 = inetutils}/inetutils-1.8-0003-wchar.patch| 0
.../inetutils-1.9-PATH_PROCNET_DEV.patch | 0
.../inetutils/{inetutils-1.9.2 = inetutils}/rexec.xinetd.inetutils | 0
.../inetutils/{inetutils-1.9.2 = inetutils}/rlogin.xinetd.inetutils | 0
.../inetutils/{inetutils-1.9.2 = inetutils}/rsh.xinetd.inetutils| 0
.../inetutils/{inetutils-1.9.2 = inetutils}/telnet.xinetd.inetutils | 0
.../telnetd-Fix-deadlock-on-cleanup.patch| 0
.../inetutils/{inetutils-1.9.2 = inetutils}/tftpd.xinetd.inetutils | 0
.../inetutils/{inetutils-1.9.2 = inetutils}/version.patch | 2 +-
.../inetutils/{inetutils_1.9.2.bb = inetutils_1.9.4.bb} | 5
+++--
12 files changed, 4 insertions(+), 3 deletions(-)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/fix-disable-ipv6.patch (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
(100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/inetutils-1.8-0003-wchar.patch (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/inetutils-1.9-PATH_PROCNET_DEV.patch (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/rexec.xinetd.inetutils (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/rlogin.xinetd.inetutils (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/rsh.xinetd.inetutils (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/telnet.xinetd.inetutils (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/telnetd-Fix-deadlock-on-cleanup.patch (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/tftpd.xinetd.inetutils (100%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils-1.9.2 =
inetutils}/version.patch (93%)
rename meta-networking/recipes-connectivity/inetutils/{inetutils_1.9.2.bb =
inetutils_1.9.4.bb} (97%)
diff --git
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/fix-disable-ipv6.patch
b/meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
similarity index 100%
rename from
meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/fix-disable-ipv6.patch
rename to
meta-networking/recipes-connectivity/inetutils/inetutils/fix-disable-ipv6.patch
diff --git
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
b/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
similarity index 100%
rename from
meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
rename to
meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch
diff --git
a/meta-networking/recipes-connectivity/inetutils/inetutils-1.9.2/inetutils-1.8-0003-wchar.patch
b/meta-networking/recipes-connectivity/inetutils/inetutils/inetutils-1.8-0003-wchar.patch
similarity index 100%
rename from
Re: [oe] [meta-oe][PATCH v5] Opencv: Add OpenCV 3.0
On Wed, Aug 19, 2015 at 12:02 PM, Ricardo Ribalda Delgado ricardo.riba...@gmail.com wrote: -Support for new PACKAGECONFIGS -Merge with opencv-samples Since it is not backward compatible with 2.x and cannot be installed in parallel it has a DEFAULT_PREFERENCE of -1. Signed-off-by: Ricardo Ribalda Delgado ricardo.riba...@gmail.com Please port the last patches from 2.x for this one. The libv4l is important for i.MX. -- 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] libvpx: fix build errors for gcc 5
Sure, send v2 when ready. On Thu, Aug 20, 2015 at 12:05 AM, Max Krummenacher max.krummenac...@solnet.ch wrote: Hi Martin Please test your patches. Sorry about that. gcc-5-max_align_t.patch and in SRC_URI there is: file://fix_build_with_gcc5.patch I'll fix it this time when cherry-picking to master-next. It is far worse than just a last minute filename change. Actually I had the missing file in another layer as I started the fix from a libvpx_xx.bbappend. So no obvious failure during bitbake and git status. The patch as it is now, even with the fixed filename, will do no harm but will also not fix anything. Can you not pull in the patch into master and give me some time to fix it properly? Regards Max -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-networking][PATCH] netcf: support multilib builds
On 2015年08月20日 03:01, Joe MacDonald wrote:
[Re: [oe] [meta-networking][PATCH] netcf: support multilib builds] On 15.08.18
(Tue 11:33) Rongqing Li wrote:
On 2015年08月18日 11:24, Joe MacDonald wrote:
When doing a multilib build, /usr/lib is still created but not collected
into FILES_${PN} by default, resulting in a QA error. Adding both
${libdir} and ${nonarch_libdir} catches all scenarios.
It also turns out that the previous do_install_append would throw an error
in a multilib build since systemd always installs to .../lib/... but
${libdir] would point at .../lib64/...
Signed-off-by: Joe MacDonald joe_macdon...@mentor.com
---
meta-networking/recipes-support/netcf/netcf_git.bb | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/meta-networking/recipes-support/netcf/netcf_git.bb
b/meta-networking/recipes-support/netcf/netcf_git.bb
index d47bb3b..8a8963e 100644
--- a/meta-networking/recipes-support/netcf/netcf_git.bb
+++ b/meta-networking/recipes-support/netcf/netcf_git.bb
@@ -32,12 +32,22 @@ do_configure_prepend() {
do_install_append() {
if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)};
then
install -d ${D}${systemd_unitdir}/system
- mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
- rm -rf ${D}${libdir}/systemd/
+ if [ -d ${D}${libdir}/systemd/system ]; then
+ mv ${D}${libdir}/systemd/system/* ${D}${systemd_unitdir}/system/
+ rm -rf ${D}${libdir}/systemd/
+ else
+ mv ${D}${nonarch_libdir}/systemd/system/*
${D}${systemd_unitdir}/system/
+ rm -rf ${D}${nonarch_libdir}/systemd/
+ fi
else
mv ${D}${sysconfdir}/rc.d/init.d/ ${D}${sysconfdir}
rm -rf ${D}${sysconfdir}/rc.d/
fi
}
+FILES_${PN} += \
+${libdir} \
+${nonarch_libdir} \
+
+
a similar fix has been submitted,
【oe] [PATCH][meta-networking] netcf: align the systemd file path with
Makefile
I looked at that fix but from what I can tell it unconditionally deletes
the 32-bit netcf shared and static libs in a multilib configuration.
That squelches the QA warning, but it's probably not what we want.
Ok, thanks
-Roy
-J.
－Roy
SYSTEMD_SERVICE_${PN} = netcf-transaction.service
--
Best Reagrds,
Roy | RongQing Li
--
Best Reagrds,
Roy | RongQing Li
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 00/55] For meta-oe fido-next
On 8/18/15 5:18 PM, Andre McCurdy wrote:
On Mon, Aug 3, 2015 at 9:22 AM, Armin Kuster akuster...@gmail.com wrote:
I don't recall if I sent this pull request already.
Please consider these changes for Meta-openembedded fido next
The following changes since commit c841231b9f327d2d06d19d2ba1324dd86b83617c:
netperf: fix the broken download url (2015-08-03 11:42:33 +0200)
are available in the git repository at:
git://github.com/akuster/meta-openembedded akuster/fido-next
https://github.com/akuster/meta-openembedded/tree/akuster/fido-next
Armin Kuster (27):
collectd: fix world build issue
libgxim: fix world build issues
protobuf: update update and build fix
serial-forward: fix fetch error
lirc: fix QA warnings
hplib: fix QA warnings
udisks: fix QA warnings
lio-utils: fix QA warnings
pm-qa: Fix QA warnings
gateone: Fix QA warnings
rarpd: Fix QA warnings
pscs-lite: Fix QA warnings
fbida: Fix QA warnings
qt-creator: Fix QA warnings
fio: Fix QA warnings
There's an improved fix for this one in master:
http://git.openembedded.org/meta-openembedded/commit/?id=eb01b36cb3f2f686bc05c690b06d1e0680dda1f5
Ah, so there is. I will add it to my list for the next round.
- armin
foxtrotgps: Fix QA warnings
usbpath: Fix QA warnings
wvstreams: Fix QA warnings
pksc11-helper: Fix QA warnings
libutempter: update SRC_URI
gammu: Fix QA warnings
mosh: Fix QA warnings
numactl: Fix QA warnings
xterm: fix issue with SRC_URI
ckermit: update SRC_URI
packagekit: Fix QA warnings
daq: move recipe to meta-networking
Chunrong Guo (2):
polkit: do not hardcode the libdir
mozjs: fix the compile error of powerpc64
Dmitry Eremin-Solenikov (1):
syslog-ng: add util-linux to DEPENDS list
Dominic Sacré (1):
fio: add missing build dependency on zlib
Haris Okanovic (1):
start-stop-daemon: Fix RCONFLICTS typo
Hugo Vasconcelos Saldanha (1):
libssh2: fix CVE-2015-1782
Josep Puigdemont (1):
libhugetlbfs: project moved to github
Khem Raj (2):
polkit-gnome: Upgrade 0.102 - 0.105
gdm: Whitelist it
Robert Yang (1):
opensaf: RDEPENDS on python and bash
Yi Zhao (17):
smstools: fix PN - BPN for multilib
hexedit: fix PN - BPN for multilib
fbgrab: fix PN - BPN for multilib
takao-fonts: fix PN - BPN for multilib
xbitmaps: fix PN - BPN for multilib
navit: fix PN - BPN for multilib
omgps: fix PN - BPN for multilib
orrery: fix PN - BPN for multilib
fltk: fix PN - BPN for multilib
mime-support: fix PN - BPN for multilib
openct: fix PN - BPN for multilib
picocom: fix PN - BPN for multilib
soci: fix PN - BPN for multilib
mozjs: fix PN - BPN for multilib
iperf: fix ${PN}-${PV} - ${BP} for multilib
synergy: fix ${PN}-${PV} - ${BP} for multilib
gpsd: fix PN - BPN for multilib
gary.robert...@linaro.org (1):
libhugetlbfs: x86 - don't link against host libs
meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb | 2 -
.../recipes-connectivity/daq/daq_2.0.2.bb | 0
...le-run-test-program-while-cross-compiling.patch | 0
.../recipes-daemons/opensaf/opensaf_4.5.0.bb | 2 +
meta-oe/recipes-benchmark/fio/fio_2.2.6.bb | 5 +-
meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 2 +-
...86-avoid-host-library-search-in-cross-dev.patch | 48 +
.../libhugetlbfs/libhugetlbfs_git.bb | 5 +-
meta-oe/recipes-connectivity/gammu/gammu_1.32.0.bb | 2 +
meta-oe/recipes-connectivity/lirc/lirc.inc | 2 +-
meta-oe/recipes-connectivity/lirc/lirc_0.9.2.bb| 1 +
meta-oe/recipes-connectivity/mosh/mosh_1.2.4.bb| 2 +-
.../smstools3/smstools3_3.1.15.bb | 2 +-
.../recipes-connectivity/wvdial/wvstreams_4.6.1.bb | 1 +
.../packagekit/packagekit_0.5.6.bb | 9 +-
meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb| 1 +
.../{protobuf_2.5.0.bb = protobuf_2.6.1.bb} | 13 ++-
.../recipes-extended/collectd/collectd_5.4.1.bb| 3 +-
meta-oe/recipes-extended/hexedit/hexedit_1.2.13.bb | 2 +-
meta-oe/recipes-extended/hplip/hplip_3.12.6.bb | 1 +
.../mozjs/fix-the-compile-error-of-powerpc64.patch | 18
meta-oe/recipes-extended/mozjs/mozjs_17.0.0.bb | 5 +-
.../polkit/files/gtk-doc-check.patch | 12 +++
...polkit-gnome_0.102.bb = polkit-gnome_0.105.bb} | 14 +--
.../polkit/0001-do-not-hardcoded-libdir.patch | 44
meta-oe/recipes-extended/polkit/polkit_0.112.bb| 1 +
meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb | 2 +
meta-oe/recipes-graphics/fbgrab/fbgrab_1.2.bb | 2 +-
meta-oe/recipes-graphics/fbida/fbida_2.10.bb | 2 +-
.../takao-fonts/takao-fonts_003.02.01.bb | 2 +-
meta-oe/recipes-graphics/xorg-app/xterm_303.bb | 2 +-
.../xorg-data/xorg-data-common.inc | 2 +-
.../foxtrotgps/foxtrotgps_1.1.1.bb | 1 +
Re: [oe] [meta-networking][PATCH] netmap v2: add new package
Hey Armin,
[[meta-networking][PATCH] netmap v2: add new package] On 15.08.09 (Sun 05:38)
Armin Kuster wrote:
From: Armin Kuster akus...@mvista.com
this adds netmap, the fast packet I/O framework
http://info.iet.unipi.it/~luigi/netmap/
v2:
fix config opt typo
fix compile on non x86 targets
exclude ppc and arm from builds do to issues with kernel headers
I was working on merging this one and ran into a number of failures, can
you take another look at it?
The first I hit was netmap-modules fails to find makefile_fixup.patch
because it is referenced in netmap.inc which is included in
netmap-modules_git.bb, but makefile_fixup.patch lives in netmap/ and
that doesn't show up in the default search path. I tried moving netmap/
to files/ so it would always get picked up but hit another failure, so
then I moved the makefile_fixup.patch reference to netmap_git.bb only
(obviously I didn't spend any time looking at whether it makes sense to
apply the patch to both recipes).
The failure I hit is actually in Martin's world build too. I grabbed
one of the relevant chunks and put it on Pastebin for you
(http://pastebin.com/kjYShFD6) so you don't have to search through the
whole log.
-J.
Signed-off-by: Armin Kuster akus...@mvista.com
---
.../netmap/files/makefile_fixup.patch | 79
++
.../recipes-kernel/netmap/netmap-modules_git.bb| 51 ++
meta-networking/recipes-kernel/netmap/netmap.inc | 17 +
.../recipes-kernel/netmap/netmap_git.bb| 34 ++
4 files changed, 181 insertions(+)
create mode 100644
meta-networking/recipes-kernel/netmap/files/makefile_fixup.patch
create mode 100644
meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
create mode 100644 meta-networking/recipes-kernel/netmap/netmap.inc
create mode 100644 meta-networking/recipes-kernel/netmap/netmap_git.bb
diff --git a/meta-networking/recipes-kernel/netmap/files/makefile_fixup.patch
b/meta-networking/recipes-kernel/netmap/files/makefile_fixup.patch
new file mode 100644
index 000..e838653
--- /dev/null
+++ b/meta-networking/recipes-kernel/netmap/files/makefile_fixup.patch
@@ -0,0 +1,79 @@
+The makefile assumes building locally.
+
+Upstream Status: Inappropriate [Native]
+
+The configure is not auto-make based
+
+Signed-of-by: Armin Kuster akus...@mvista.com
+
+Index: LINUX/netmap.mak.in
+===
+--- a/LINUX/netmap.mak.in
b/LINUX/netmap.mak.in
+@@ -12,10 +12,8 @@ SRCDIR:=@SRCDIR@
+ # The following commands are needed to build the modules as out-of-tree,
+ # in fact the kernel sources path must be specified.
+
+-PWD ?= $(CURDIR)
+-
+ # Additional compile flags (e.g. header location)
+-EXTRA_CFLAGS := -I$(PWD) -I$(SRCDIR) -I$(SRCDIR)/../sys
-I$(SRCDIR)/../sys/dev -DCONFIG_NETMAP
++EXTRA_CFLAGS := -I$(SRCDIR) -I$(SRCDIR)/../sys -I$(SRCDIR)/../sys/dev
-DCONFIG_NETMAP
+ EXTRA_CFLAGS += -Wno-unused-but-set-variable
+ EXTRA_CFLAGS += $(foreach s,$(SUBSYS),-DCONFIG_NETMAP_$(shell echo $s|tr
a-z A-Z))
+
+Index: LINUX/configure
+===
+--- a/LINUX/configure
b/LINUX/configure
+@@ -311,34 +311,6 @@ reset_tests() {
+ NEXTTEST=1
+ }
+
+-# run_tests: run all accumulated tests and exec the pertinent
+-# success/failure actions for each one.
+-run_tests() {
+-local t=# prevent -EOF to eat the make TAB
+-cat $TMPDIR/Makefile -EOF
+-ifneq (\$(KERNELRELEASE),)
+-obj-m := $TESTOBJS
+-else
+-S_DRIVERS := $(drv print)
+-all: \$(S_DRIVERS:%=get-%)
+-$t \$(MAKE) -C $ksrc M=\$\$PWD $kopts
+-
+--include $TOPDIR/drivers.mak
+-EOF
+-for d in $(drv print); do
+-cat $TMPDIR/Makefile -EOF
+-get-$d:
+-$t [ -z \$($d-src) ] || cp -Rp \$($d-src) \$(if
\$($d-dst),\$($d-dst),.)
+-EOF
+-done
+-echo endif $TMPDIR/Makefile
+-(
+-cd $TMPDIR
+-make -k -j $(grep -c processor /proc/cpuinfo)
+-) config.log
+-eval $TESTPOSTPROC
+-}
+-
+ configh=netmap_linux_config.h
+ # succes/failure actions are expected to write some macros
+ # in netma_linux_config.h. The following functions can be
+@@ -555,7 +527,6 @@ configuration. Please check 'config.log'
+
+ reset_tests
+ add_test true broken_buildsystem /dev/null
+-run_tests
+
+ drvname2config() {
+ local name=$1
+@@ -1087,7 +1058,6 @@ cat $configh -EOF
+ EOF
+
+ # the TESTPOSTPROC script will add macros to $configh
+-run_tests
+
+ define DRIVER_SUFFIX \$drvsuffix\
+
diff --git a/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
b/meta-networking/recipes-kernel/netmap/netmap-modules_git.bb
new file mode 100644
index 000..00d334f
--- /dev/null
+++
[oe] [meta-java][PATCH] OpenJDK-8: For x86 and ARM
From: Vinay K. Awasthi vinay.k.awas...@intel.com
OpenJDK-8 Update Build 60b27:
This package enables OpenJDK-8 update for x86 and ARM in following VM
configurations.
For x86: Hotspot VM is enabled.
For ARM: Zero VM is enabled.
OpenJDK-8 compact profiles can also be built using this recipe (see commented
out code).
Introduction to compact profiles can be found here..
http://openjdk.java.net/jeps/161
Signed-off-by: Vinay K. Awasthi vinay.k.awas...@intel.com
---
.../openjdk-8-60b27/cacao-arm-ucontext.patch | 24 +
.../openjdk/openjdk-8-60b27/cacao-libtoolize.patch | 12 +
.../openjdk-8-60b27/cacao-loadavg-makefile.patch | 13 +
.../openjdk/openjdk-8-60b27/cacao-loadavg.patch| 27 +
.../openjdk-8-60b27/faulty-nx-emulation.patch | 12 +
.../openjdk/openjdk-8-60b27/fix-checksums.patch| 61 ++
recipes-core/openjdk/openjdk-8-60b27/jvm.cfg | 43 ++
.../openjdk/openjdk-8-60b27/zero-build.patch | 14 +
recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb | 621 +
recipes-images/images/java-test-image.bb | 1 +
10 files changed, 828 insertions(+)
create mode 100644
recipes-core/openjdk/openjdk-8-60b27/cacao-arm-ucontext.patch
create mode 100644 recipes-core/openjdk/openjdk-8-60b27/cacao-libtoolize.patch
create mode 100644
recipes-core/openjdk/openjdk-8-60b27/cacao-loadavg-makefile.patch
create mode 100644 recipes-core/openjdk/openjdk-8-60b27/cacao-loadavg.patch
create mode 100644
recipes-core/openjdk/openjdk-8-60b27/faulty-nx-emulation.patch
create mode 100644 recipes-core/openjdk/openjdk-8-60b27/fix-checksums.patch
create mode 100644 recipes-core/openjdk/openjdk-8-60b27/jvm.cfg
create mode 100644 recipes-core/openjdk/openjdk-8-60b27/zero-build.patch
create mode 100644 recipes-core/openjdk/openjdk-8_60b27-2.5.4.bb
diff --git a/recipes-core/openjdk/openjdk-8-60b27/cacao-arm-ucontext.patch
b/recipes-core/openjdk/openjdk-8-60b27/cacao-arm-ucontext.patch
new file mode 100644
index 000..c21fcf1
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-60b27/cacao-arm-ucontext.patch
@@ -0,0 +1,24 @@
+Index: cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c
+===
+--- cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c2013-01-26
21:30:54.206581090 +0100
cacao-a567bcb7f589/src/vm/jit/arm/linux/md-os.c2013-01-26
21:31:34.406991316 +0100
+@@ -28,19 +28,7 @@
+
+ #include stdint.h
+
+-#define ucontext broken_glibc_ucontext
+-#define ucontext_t broken_glibc_ucontext_t
+ #include ucontext.h
+-#undef ucontext
+-#undef ucontext_t
+-
+-typedef struct ucontext {
+- unsigned long uc_flags;
+- struct ucontext *uc_link;
+- stack_t uc_stack;
+- struct sigcontext uc_mcontext;
+- sigset_t uc_sigmask;
+-} ucontext_t;
+
+ #define scontext_t struct sigcontext
+
diff --git a/recipes-core/openjdk/openjdk-8-60b27/cacao-libtoolize.patch
b/recipes-core/openjdk/openjdk-8-60b27/cacao-libtoolize.patch
new file mode 100644
index 000..484cb10
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-60b27/cacao-libtoolize.patch
@@ -0,0 +1,12 @@
+Index: icedtea6/Makefile.am
+===
+--- icedtea6.orig/Makefile.am 2011-12-21 22:58:23.0 +0100
icedtea6/Makefile.am 2011-12-21 23:00:21.405887186 +0100
+@@ -1922,6 +1922,7 @@
+ if BUILD_CACAO
+ if !USE_SYSTEM_CACAO
+ cd cacao/cacao \
++ rm -f libtool \
+ ./autogen.sh \
+ $(ARCH_PREFIX) ./configure \
+ --host=$(host_alias) \
diff --git a/recipes-core/openjdk/openjdk-8-60b27/cacao-loadavg-makefile.patch
b/recipes-core/openjdk/openjdk-8-60b27/cacao-loadavg-makefile.patch
new file mode 100644
index 000..a389206
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-60b27/cacao-loadavg-makefile.patch
@@ -0,0 +1,13 @@
+Index: icedtea-2.1.4/Makefile.am
+===
+--- icedtea-2.1.4.orig/Makefile.am 2013-01-26 18:20:55.152561203 +0100
icedtea-2.1.4/Makefile.am 2013-01-26 18:41:07.637992206 +0100
+@@ -1994,6 +1994,8 @@
+ if BUILD_CACAO
+ if !USE_SYSTEM_CACAO
+ cd cacao/cacao \
++ patch -p1 -N $(abs_top_srcdir)/patches/cacao-loadavg.patch \
++ patch -p1 -N $(abs_top_srcdir)/patches/cacao-arm-ucontext.patch \
+ rm -f libtool \
+ ./autogen.sh \
+ $(ARCH_PREFIX) ./configure \
diff --git a/recipes-core/openjdk/openjdk-8-60b27/cacao-loadavg.patch
b/recipes-core/openjdk/openjdk-8-60b27/cacao-loadavg.patch
new file mode 100644
index 000..0fc1a81
--- /dev/null
+++ b/recipes-core/openjdk/openjdk-8-60b27/cacao-loadavg.patch
@@ -0,0 +1,27 @@
+Index: cacao-cff92704c4e0/src/vm/os.hpp
+===
+--- cacao-cff92704c4e0/src/vm/os.hpp 2011-12-08 13:40:45.0 +0100
cacao-cff92704c4e0/src/vm/os.hpp 2011-12-20 11:42:36.985633921 +0100
+@@ -425,7
[oe] [meta-oe][PATCH v2] pmtools: add new recipe
pmtools contains small collection of power management test and
investigation tools,
acpidump - dump a system’s ACPI tables to an ASCII file
acpixtract - convert ASCII acpidump output to raw binary table
madt - parser for ACPI table
Signed-off-by: Jagadeesh Krishnanjanappa jkrishnanjana...@mvista.com
---
meta-oe/recipes-devtools/pmtools/pmtools_git.bb | 27 +
1 file changed, 27 insertions(+)
create mode 100644 meta-oe/recipes-devtools/pmtools/pmtools_git.bb
diff --git a/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
new file mode 100644
index 000..602da5e
--- /dev/null
+++ b/meta-oe/recipes-devtools/pmtools/pmtools_git.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = This is a small collection of power management \
+ test and investigation tools
+HOMEPAGE = http://lesswatts.org/projects/acpi;
+LICENSE = GPLv2+
+LIC_FILES_CHKSUM = file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3
+
+PV = 20130209+git${SRCPV}
+
+SRC_URI = git://github.com/anyc/pmtools.git;protocol=https
+SRCREV = 3ebe0e54c54061b4c627236cbe35d820de2e1168
+
+COMPATIBLE_HOST = (i.86|x86_64).*-linux
+
+S = ${WORKDIR}/git
+
+do_configure[noexec] = 1
+do_compile() {
+ oe_runmake
+}
+
+do_install() {
+ install -d ${D}${bindir} ${D}${docdir}
+ install -m 755 ${S}/acpidump/acpidump ${D}${bindir}
+ install -m 755 ${S}/acpixtract/acpixtract ${D}${bindir}
+ install -m 755 ${S}/madt/madt ${D}${bindir}
+ install -m 644 ${S}/README ${D}${docdir}
+}
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/2][meta-oe] zeromq: upgrade to 4.1.3
From: Roy Li rongqing...@windriver.com
4.1.3 has the dependence on libsodium,
4.1.3 asks pkgconfig bbclass to configure,
add a target to build ptest, since the orignial check will build and run
which is not suitable for cross-compile, and change the ptest installation
directories
Signed-off-by: Roy Li rongqing...@windriver.com
---
.../zeromq/{zeromq_4.0.4.bb = zeromq_4.1.3.bb}| 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
rename meta-oe/recipes-connectivity/zeromq/{zeromq_4.0.4.bb =
zeromq_4.1.3.bb} (62%)
diff --git a/meta-oe/recipes-connectivity/zeromq/zeromq_4.0.4.bb
b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.3.bb
similarity index 62%
rename from meta-oe/recipes-connectivity/zeromq/zeromq_4.0.4.bb
rename to meta-oe/recipes-connectivity/zeromq/zeromq_4.1.3.bb
index 80907fa..5d0e2d5 100644
--- a/meta-oe/recipes-connectivity/zeromq/zeromq_4.0.4.bb
+++ b/meta-oe/recipes-connectivity/zeromq/zeromq_4.1.3.bb
@@ -2,12 +2,13 @@ DESCRIPTION = ZeroMQ looks like an embeddable networking
library but acts like
HOMEPAGE = http://www.zeromq.org;
LICENSE = LGPLv3+
LIC_FILES_CHKSUM = file://COPYING.LESSER;md5=d5311495d952062e0e4fbba39cbf3de1
+DEPENDS = libsodium
SRC_URI = http://download.zeromq.org/zeromq-${PV}.tar.gz \
file://run-ptest \
-SRC_URI[md5sum] = f3c3defbb5ef6cc000ca65e529fdab3b
-SRC_URI[sha256sum] =
1ef71d46e94f33e27dd5a1661ed626cd39be4d2d6967792a275040e34457d399
+SRC_URI[md5sum] = d0824317348cfb44b8692e19cc73dc3a
+SRC_URI[sha256sum] =
61b31c830db37e417235a24d3660a4bcc3f40d303ee58df082fcd68bf411
S = ${WORKDIR}/zeromq-${PV}
@@ -16,9 +17,14 @@ S = ${WORKDIR}/zeromq-${PV}
#CFLAGS_append += -O0
#CXXFLAGS_append += -O0
-inherit autotools ptest
+inherit autotools ptest pkgconfig
+
+do_compile_ptest () {
+ echo 'buildtest-TESTS: $(check_PROGRAMS)' ${B}/Makefile
+ oe_runmake buildtest-TESTS
+}
do_install_ptest () {
install -d ${D}${PTEST_PATH}/tests
-install -m 0755 ${B}/tests/.libs/* ${D}${PTEST_PATH}/tests
+install -m 0755 ${B}/.libs/test_* ${D}${PTEST_PATH}/tests
}
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH 1/2][meta-oe] libsodium: create recipe
From: Roy Li rongqing...@windriver.com
zeromq 4.1.3 requires libsodium
Sodium is a new, easy-to-use software library for encryption, decryption,
signatures, password hashing and more. It is a portable, cross-compilable,
installable, packageable fork of NaCl, with a compatible API, and an extended
API to improve usability even further. Its goal is to provide all of the core
operations needed to build higher-level cryptographic tools. The design
choices emphasize security, and magic constants have clear rationales.
The same cannot be said of NIST curves, where the specific origins of certain
constants are not described by the standards. And despite the emphasis on
higher security, primitives are faster across-the-board than most
implementations of the NIST standards.
Signed-off-by: Roy Li rongqing...@windriver.com
---
meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb | 11 +++
1 file changed, 11 insertions(+)
create mode 100644 meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb
diff --git a/meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb
b/meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb
new file mode 100644
index 000..d02bb9b
--- /dev/null
+++ b/meta-oe/recipes-support/libsodium/libsodium_1.0.3.bb
@@ -0,0 +1,11 @@
+SUMMARY = The Sodium crypto library
+HOMEPAGE = http://libsodium.org/;
+LICENSE = ISC
+LIC_FILES_CHKSUM = file://LICENSE;md5=092a09b78c3be486fac807435bf17b7a
+
+SRC_URI =
https://download.libsodium.org/libsodium/releases/${BPN}-${PV}.tar.gz;
+
+SRC_URI[md5sum] = b3bcc98e34d3250f55ae196822307fab
+SRC_URI[sha256sum] =
cbcfc63cc90c05d18a20f229a62c7e7054a73731d0aa858c0517152c549b1288
+
+inherit autotools
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][meta-multimedia][PATCH 2/2] vlc: update to 2.2.1
On 08/19/2015 05:05 AM, Tim Orling wrote:
On Tue, Aug 18, 2015 at 2:44 AM, Martin Jansa martin.ja...@gmail.com
wrote:
On Sun, Aug 02, 2015 at 06:07:57PM -0700, Tim Orling wrote:
I accidentally left libvorbis as a dependency in vlc.inc, which is not
needed (tremor provides what was needed).
You can pull the corrected recipes from:
http://git.openembedded.org/meta-openembedded-contrib/log/?h=timo/vlc-2.2.1
--Tim
It still fails with that libtool error:
http://errors.yoctoproject.org/Errors/Details/14498/
but I'll merge it anyway, because it doesn't make things worse than old
version.
It is having a problem with the assembly files (e.g.
vlc-2.2.1/modules/arm_neon/i422_yuyv.S )
Anybody have any ideas? I would guess that --tag=CC would still apply, but
I don't see any obvious support for assembly files in the libtool docs.
--Tim
This vlc.inc diff lets VLC build correctly for me:
-sed -i -e s:'${top_builddir_slash}libtool':${TARGET_SYS}-libtool:g
${B}/doltlibtool
+sed -i -e
s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g
${B}/doltlibtool
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libjs-sizzle: upgrade 1.9.3 - 1.10.18
* Modify SRC_URI to avoid do_fetch failed.
* Modify LICENSE file,and the LICENSE has been changed.
* Replace the hardcoded strings /usr/share
Signed-off-by: Li Xin lixin.f...@cn.fujitsu.com
---
...bjs-sizzle_1.9.3.bb = libjs-sizzle_1.10.18.bb} | 24 ++
1 file changed, 11 insertions(+), 13 deletions(-)
rename meta-oe/recipes-support/libjs/{libjs-sizzle_1.9.3.bb =
libjs-sizzle_1.10.18.bb} (15%)
diff --git a/meta-oe/recipes-support/libjs/libjs-sizzle_1.9.3.bb
b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
similarity index 15%
rename from meta-oe/recipes-support/libjs/libjs-sizzle_1.9.3.bb
rename to meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
index ad0f9c6..92ab31f 100644
--- a/meta-oe/recipes-support/libjs/libjs-sizzle_1.9.3.bb
+++ b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
@@ -1,20 +1,18 @@
SUMMARY = Pure-JavaScript CSS selector engine
-LICENSE = GPLv2+ MIT BSD-3-Clause
-LIC_FILES_CHKSUM =
file://usr/share/doc/libjs-sizzle/copyright;md5=9b35efb1635ff8f06d1984376b06ee5a
+LICENSE = GPL-2.0 MIT AFL-2.1
+LIC_FILES_CHKSUM =
file://MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9
-SRC_URI =
http://kr.archive.ubuntu.com/ubuntu/pool/universe/s/sizzle/${BPN}_${PV}-1_all.deb;subdir=${BP};
-SRC_URI[md5sum] = 748b8805e21caed658f6765f7c491d46
-SRC_URI[sha256sum] =
2a6468763c40a30f6f7d0df8906cd17aaebd6edaa5478aeaffd7b6b5fb8abd35
+SRC_URI =
http://kr.archive.ubuntu.com/ubuntu/pool/universe/s/sizzle/sizzle_1.10.18.orig.tar.gz;
+SRC_URI[md5sum] = 91477c1edeef9f8100ffd6c4d31725b5
+SRC_URI[sha256sum] =
8e04ab84bb74b2e338dffc63cd2e52b007f1d8af01b3d25da4d2e07f2b5890f8
-SIZZLEDIR = ${datadir}/javascript/sizzle
-SIZZLEDOCDIR = ${docdir}/libjs-sizzle
+S = ${WORKDIR}/sizzle-${PV}
+
+SIZZLEDIR = ${S}/dist
do_install() {
-install -d -m 0755 ${D}${SIZZLEDIR}
-install -m 0644 ${S}${SIZZLEDIR}/sizzle.js ${D}${SIZZLEDIR}/
-install -m 0644 ${S}${SIZZLEDIR}/sizzle.min.js ${D}${SIZZLEDIR}/
-install -d -m 0755 ${D}${SIZZLEDOCDIR}
-install -m 0644 ${S}${SIZZLEDOCDIR}/* ${D}${SIZZLEDOCDIR}/
+install -d -m 0755 ${D}/${datadir}/javascript/sizzle/
+install -m 0644 ${SIZZLEDIR}/*.js ${D}/${datadir}/javascript/sizzle/
}
-FILES_${PN} = /usr/share/javascript/sizzle/
+FILES_${PN} = ${datadir}/javascript/sizzle/
--
1.8.4.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH] rp-pppoe:3.8-3.11
-deleted use-ldflags.patch that not needed.
-modified patches for 3.11
Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com
---
.../configure.in-Error-fix.patch | 18 +
.../configure.patch| 0
.../configure_in_cross.patch | 46 ++
.../discard-use-of-dnl-in-Makefile.am.patch| 0
.../rp-pppoe-3.11/dont-swallow-errors.patch| 28 +
.../pppoe-server.default | 0
.../pppoe-server.init | 0
.../pppoe-server.service | 0
.../pppoe-src-restrictions.patch | 0
.../top-autoconf.patch | 0
.../update-config.patch| 0
.../rp-pppoe-3.8/dont-swallow-errors.patch | 15 ---
.../rp-pppoe/rp-pppoe-3.8/use-ldflags.patch| 27 -
.../rp-pppoe/{rp-pppoe_3.8.bb = rp-pppoe_3.11.bb} | 7 ++--
14 files changed, 71 insertions(+), 70 deletions(-)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/configure.in-Error-fix.patch (70%)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/configure.patch (100%)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/configure_in_cross.patch (79%)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/discard-use-of-dnl-in-Makefile.am.patch (100%)
create mode 100644
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/dont-swallow-errors.patch
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/pppoe-server.default (100%)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/pppoe-server.init (100%)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/pppoe-server.service (100%)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/pppoe-src-restrictions.patch (100%)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/top-autoconf.patch (100%)
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe-3.8 =
rp-pppoe-3.11}/update-config.patch (100%)
delete mode 100644
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch
delete mode 100644
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch
rename meta-networking/recipes-protocols/rp-pppoe/{rp-pppoe_3.8.bb =
rp-pppoe_3.11.bb} (91%)
diff --git
a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.in-Error-fix.patch
b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.in-Error-fix.patch
similarity index 70%
rename from
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.in-Error-fix.patch
rename to
meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.in-Error-fix.patch
index 1e815f3..2661fd3 100644
---
a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.in-Error-fix.patch
+++
b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.in-Error-fix.patch
@@ -1,6 +1,6 @@
-From a546942a784a177080d9722dda873bfd7416ad41 Mon Sep 17 00:00:00 2001
-From: Li xin lixin.f...@cn.fujitsu.com
-Date: Fri, 10 Apr 2015 13:13:06 +0900
+From 71956de46feef962dc0645af4c81ae074ca3b818 Mon Sep 17 00:00:00 2001
+From: Lei Maohui leimao...@cn.fujitsu.com
+Date: Wed, 19 Aug 2015 13:52:57 +0900
Subject: [PATCH] configure.in: Error fix.
the error is: conftest.c:9:28: fatal error: ac_nonexistent.h:
@@ -10,19 +10,20 @@ Upstream-Status: pending
Signed-off-by: Li Xin lixin.f...@cn.fujitsu.com
---
- src/configure.in | 28
- 1 file changed, 28 deletions(-)
+ src/configure.in | 30 --
+ 1 file changed, 30 deletions(-)
diff --git a/src/configure.in b/src/configure.in
-index c4f1a8c..74956cc 100644
+index 0b23df5..31c7fbc 100644
--- a/src/configure.in
+++ b/src/configure.in
-@@ -183,34 +183,6 @@ if test $GCC = yes; then
- CFLAGS=$CFLAGS -Wall -Wstrict-prototypes -ansi
+@@ -193,36 +193,6 @@ if test $GCC = yes; then
+ CFLAGS=$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes
fi
-dnl Figure out packing order of structures
-AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[
+-if test ${rpppoe_cv_pack_bitfields+set} != set ; then
-AC_TRY_RUN([
-union foo {
-struct bar {
@@ -47,6 +48,7 @@ index c4f1a8c..74956cc 100644
-}
-}], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev,
-$ECHO no defaults for cross-compiling; exit 1)
+-fi
-])
-
if test $rpppoe_cv_pack_bitfields = rev ; then
diff --git
a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.8/configure.patch
b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.patch
similarity index 100%
rename from
Re: [oe] [meta-oe] inconsistency between autotests and ssh support
Hi Paul, thanks for the pointer. If I stumble across the doc reference I'll shout. Amit On Tue, Aug 18, 2015 at 1:39 PM, Paul Eggleton paul.eggle...@linux.intel.com wrote: Hi Amit, On Tuesday 18 August 2015 09:34:44 Amit Chaudhuri wrote: I am experimenting with tools-profile and qemux86 and qemuarm. Autotest failures make me think there is an inconsistency in the recipes and possibly also somewhere in the docs. I was under the impression (from docs?) that core-image-base would add ssh support so I switched from core-image-minimal. Whether I was looking in the wrong version of docs or not, the failure of the autotests makes me think there is a problem. Examining the ssh log listed in the test output I can see multiple connection refused on port 22 messages and there is clearly no ssh server in the image. The test output shows that some tests are indeed skipped because the system knows ssh is not present. But multiple other tests are not skipped. Same experience on both qemuarm and qemux86. After greping to find ssh-server in a .bb file I switched again to core-image-full-cmdline and am now able to ssh in. I still get an error relating to something else, but ssh works fine. With fido version: meta = fido:6546771a502a09c63e33679be8784818be0ef93b The main changes I have made are to local.conf where I have: MACHINE ??= qemuarm EXTRA_IMAGE_FEATURES = dbg-pkgs tools-profile tools-debug debug-tweaks Since you're already setting EXTRA_IMAGE_FEATURES, just add ssh-server-dropbear or ssh-server-openssh to its value and you'll have SSH server support no matter which image you build. I'm not sure where we'd have documented that core-image-base has an SSH server - at least I can't find such a reference. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] Status of glibc patch for function inlining with -O or -Os
http://comments.gmane.org/gmane.comp.handhelds.openembedded.core/60843 Hi, in section 5.24 in the latest mega-manual it says: For successful call graph analysis, the binaries must preserve the frame pointer register and should also be compiled with the -fno-omit-framepointer flag. You can achieve this by setting the SELECTED_OPTIMIZATION variable with the following options: -fexpensive-optimizations -fno-omit-framepointer -frename-registers -O2 You can also achieve it by setting the DEBUG_BUILD variable to 1 in the local.conf configuration file. If you use the DEBUG_BUILD variable, you also add extra debugging information that can make the debug packages large. The second of these options does not work with core-image-sato on qemuarm, failing with errors about failed function inlining when building glibc. I stumbled across 3 google references (one listed above) to a problem with glibc and function inlining dated ~ 6 months ago. The threads imply patches were being worked on but they don't appear to have been adopted. Is there a reason for this that should discourage use of those patches? Regards, Amit -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [PATCH][meta-oe] dialog: upgrade to 1.2-20150528
From: Roy Li rongqing...@windriver.com
remove use-pkg-config-for-ncurses-detection.patch, the new version is
using the pkg-config to check ncurses
configuration assumes the cf_have_ncuconfig is unknown for cross-compile,
but ncurses is added into DEPENDS, so change it as yes
Signed-off-by: Roy Li rongqing...@windriver.com
---
...alog_1.2-20150225.bb = dialog_1.2-20150528.bb} | 6 ++--
.../use-pkg-config-for-ncurses-detection.patch | 32 --
2 files changed, 3 insertions(+), 35 deletions(-)
rename meta-oe/recipes-extended/dialog/{dialog_1.2-20150225.bb =
dialog_1.2-20150528.bb} (78%)
delete mode 100644
meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
diff --git a/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
b/meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb
similarity index 78%
rename from meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
rename to meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb
index 88af59f..4fb938e 100644
--- a/meta-oe/recipes-extended/dialog/dialog_1.2-20150225.bb
+++ b/meta-oe/recipes-extended/dialog/dialog_1.2-20150528.bb
@@ -8,11 +8,10 @@ DEPENDS = ncurses
LICENSE = LGPL-2.1
LIC_FILES_CHKSUM = file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343
-SRC_URI[md5sum] = 38ef59a7daa5459119cb06777c735e4b
-SRC_URI[sha256sum] =
6844b13a7a1fea568a8d5bb3004e1af90888cd4a5e8c2ded2c38f34fcc7397ff
+SRC_URI[md5sum] = 593615fb448e001e5b81420473a7354b
+SRC_URI[sha256sum] =
a8cd7a66bdb41e53a3145cbb0eb370c5ce7300fe0e9ad6d3e8d3b9e16ff16418
SRC_URI = ftp://invisible-island.net/dialog/dialog-${PV}.tgz \
- file://use-pkg-config-for-ncurses-detection.patch \
# hardcoded here for use in dialog-static recipe
@@ -26,5 +25,6 @@ EXTRA_OECONF = --with-ncurses \
do_configure() {
gnu-configize --force
sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i
configure
+sed -i 's,cf_have_ncuconfig=unknown,cf_have_ncuconfig=yes,g' -i configure
oe_runconf
}
diff --git
a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
deleted file mode 100644
index 0a25a7f..000
---
a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: [PATCH] use pkg-config for ncurses detection.
-
-Upstream-Status: Inappropriate [configuration]
-
-This is a workaround to make dialog be able to build after ncurses-config
-does not work, since the configure file is called directly in dialog bb
-file, and autoconf can not work, make a workaround in configure file.
-
-Signed-off-by: Roy Li rongqing...@windriver.com
- configure | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/configure b/configure
-index 8afe3d7..a54bcc1 100755
a/configure
-+++ b/configure
-@@ -11567,9 +11567,8 @@ fi
-
- if test $NCURSES_CONFIG != none ; then
-
--CPPFLAGS=$CPPFLAGS `$NCURSES_CONFIG --cflags`
--
--cf_add_libs=`$NCURSES_CONFIG --libs`
-+CPPFLAGS=$CPPFLAGS `pkg-config --short-errors --print-errors --cflags
ncurses 2/dev/null`
-+cf_add_libs=`pkg-config --short-errors --print-errors --libs ncurses
2/dev/null` $LIBS
- # Filter out duplicates - this happens with badly-designed .pc files...
- for cf_add_1lib in $LIBS
- do
---
-1.7.10.4
-
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] rrdtool: 1.4.8-1.5.4
-deleted the patched that have been merged to 1.5.4
Signed-off-by: Lei Maohui leimao...@cn.fujitsu.com
---
.../rrdtool/0001-removing-testing-leftovers.patch | 39 --
.../rrdtool/remove_hardcoded_xml_include.patch | 11 --
.../rrdtool/{rrdtool_1.4.8.bb = rrdtool_1.5.4.bb} | 12 +++
3 files changed, 5 insertions(+), 57 deletions(-)
delete mode 100644
meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch
delete mode 100644
meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
rename meta-oe/recipes-extended/rrdtool/{rrdtool_1.4.8.bb = rrdtool_1.5.4.bb}
(92%)
diff --git
a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch
b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch
deleted file mode 100644
index cf5d775..000
---
a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c581b02d074f5a109074bc190f373f5ba4320468 Mon Sep 17 00:00:00 2001
-From: Tobias Oetiker t...@oetiker.ch
-Date: Thu, 3 Oct 2013 15:51:00 +0200
-Subject: [PATCH] removing testing leftovers
-
-Upstream-Status: Backport
-
-Signed-off-by: Peter A. Bigot p...@pabigot.com
-
- bindings/perl-piped/leaktest.pl | 16
- 1 file changed, 16 deletions(-)
- delete mode 100644 bindings/perl-piped/leaktest.pl
-
-diff --git a/bindings/perl-piped/leaktest.pl b/bindings/perl-piped/leaktest.pl
-deleted file mode 100644
-index cebf1c7..000
a/bindings/perl-piped/leaktest.pl
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#!/bin/perl -w
--$ENV{PATH}=/usr/ucb;
--use strict;
--use RRDp;
--my $rrdfile='/tmp/test.rrd';
--RRDp::start '/home/oetiker/data/projects/AABN-rrdtool/src/rrdtool';
--print grep /rrdtool/,`ps au`;
--print grep /rrdtool/,`ps au`;
--my $i=0;
--while ($i1000) {
-- RRDp::cmd 'info /tmp/test.rrd';
-- $_ = RRDp::read;
-- $i++;
--}
--$_ = RRDp::end;
--print grep /rrdtool/,`ps au`;
---
-1.8.5.5
-
diff --git
a/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
b/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
deleted file mode 100644
index 321a842..000
---
a/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/configure.ac 2012-11-06 11:20:54.099021892 -0500
-+++ b/configure.ac~2012-11-06 11:19:57.255023857 -0500
-@@ -548,7 +548,7 @@
-
- fi
- EX_CHECK_ALL(glib-2.0, glib_check_version,glib.h,
glib-2.0,2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, )
--EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h,
libxml-2.0,2.7.8, http://xmlsoft.org/downloads.html,
/usr/include/libxml2)
-+EX_CHECK_ALL(xml2, xmlParseFile, libxml/parser.h,
libxml-2.0,2.7.8, http://xmlsoft.org/downloads.html, )
-
- if test $EX_CHECK_ALL_ERR = YES; then
- AC_MSG_ERROR([Please fix the library issues listed above and try again.])
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
similarity index 92%
rename from meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
rename to meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
index 6bc5e98..f252df5 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
@@ -2,18 +2,16 @@ SUMMARY = High performance data logging and graphing system
for time series dat
HOMEPAGE = http://oss.oetiker.ch/rrdtool/;
LICENSE = GPLv2
-LIC_FILES_CHKSUM = file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0
+LIC_FILES_CHKSUM = file://COPYRIGHT;md5=3349111ed0533471494beec99715bc9d
DEPENDS = libpng zlib cairo pango glib-2.0 libxml2 groff-native
-SRCREV = 1850e00a17e25e93c39e608f4e2da50f29c5c712
-PV = 1.4.8
+SRCREV = 04f70058cc894c0a3ee5d555ea1bb5a8d4bb8a0e
+PV = 1.5.4
SRC_URI = \
-git://github.com/oetiker/rrdtool-1.x.git;branch=1.4 \
-file://remove_hardcoded_xml_include.patch \
-file://0001-removing-testing-leftovers.patch \
-
+ git://github.com/oetiker/rrdtool-1.x.git;branch=1.5 \
+
S = ${WORKDIR}/git
--
1.8.4.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
