[oe] [meta-networking][PATCH] conntrack-tools: add depends on bison-native
From: Jackie Huang jackie.hu...@windriver.com Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../conntrack-tools/conntrack-tools_1.4.0.bb |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb index 907a3be..6a9c8a6 100644 --- a/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb +++ b/meta-networking/recipes-filter/conntrack-tools/conntrack-tools_1.4.0.bb @@ -2,7 +2,7 @@ SUMMARY = Connection tracking userspace tools for Linux LICENSE = GPLv2+ LIC_FILES_CHKSUM = file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b DEPENDS = libnfnetlink libnetfilter-conntrack libnetfilter-cttimeout \ - libnetfilter-cthelper libnetfilter-queue + libnetfilter-cthelper libnetfilter-queue bison-native SRC_URI = \ -- 1.7.9.5 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] pm-qa: update to 0.4.10 release
Update SRC_URI, /tools/ is deprecated.
Signed-off-by: Fathi Boudra fathi.bou...@linaro.org
---
meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
b/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
index f6ffcb6..9243340 100644
--- a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
+++ b/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
@@ -4,14 +4,14 @@ HOMEPAGE =
https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/Test
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
-PV = 0.4.9
+PV = 0.4.10
BRANCH ?= master
-# Corresponds to tag pm-qa-v0.4.9
-SRCREV = c54941a9bbaac33e44e6d0c7f5344e21102642cf
+# Corresponds to tag pm-qa-v0.4.10
+SRCREV = 03a22d5ad7deb6021b2ec1d546a960d8a9878255
-SRC_URI = git://git.linaro.org/tools/pm-qa.git;protocol=git;branch=${BRANCH}
+SRC_URI = git://git.linaro.org/power/pm-qa.git;protocol=git;branch=${BRANCH}
S = ${WORKDIR}/git
--
1.9.3
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] pm-qa: update to 0.4.10 release
Op 20 mei 2014, om 08:49 heeft Fathi Boudra fathi.bou...@linaro.org het
volgende geschreven:
Update SRC_URI, /tools/ is deprecated.
Signed-off-by: Fathi Boudra fathi.bou...@linaro.org
---
meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
b/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
index f6ffcb6..9243340 100644
--- a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
+++ b/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
@@ -4,14 +4,14 @@ HOMEPAGE =
https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/Test
LICENSE = GPLv2
LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
-PV = 0.4.9
+PV = 0.4.10
BRANCH ?= master
-# Corresponds to tag pm-qa-v0.4.9
-SRCREV = c54941a9bbaac33e44e6d0c7f5344e21102642cf
+# Corresponds to tag pm-qa-v0.4.10
+SRCREV = 03a22d5ad7deb6021b2ec1d546a960d8a9878255
-SRC_URI =
git://git.linaro.org/tools/pm-qa.git;protocol=git;branch=${BRANCH}
+SRC_URI =
git://git.linaro.org/power/pm-qa.git;protocol=git;branch=${BRANCH}
Nitpick: protocol=http might be better, git:// is flaky on git.linaro.org.
regards,
Koen
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [poky]: libusb1_1.0.18.bb: configure: error: udev support requested but libudev not installed
configure: error: udev support requested but libudev not installed We are seeing the same problem. This may be because the patch libusb1: disable floating dependency on udev has not been committed. May I please request this is done soon as our autobuilder has been broken for 4 nights now -- Nick The details of this company are as follows: G4S Technology Limited, Registered Office: Challenge House, International Drive, Tewkesbury, Gloucestershire GL20 8UQ, Registered in England No. 2382338. This communication may contain information which is confidential, personal and/or privileged. It is for the exclusive use of the intended recipient(s). If you are not the intended recipient(s), please note that any distribution, forwarding, copying or use of this communication or the information in it is strictly prohibited. Any personal views expressed in this e-mail are those of the individual sender and the company does not endorse or accept responsibility for them. Prior to taking any action based upon this e-mail message, you should seek appropriate confirmation of its authenticity. This e-mail has been scanned for all viruses by MessageLabs. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] pm-qa: update to 0.4.10 release
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Koen Kooi schreef op 20-05-14 09:09:
Op 20 mei 2014, om 08:49 heeft Fathi Boudra fathi.bou...@linaro.org het
volgende geschreven:
Update SRC_URI, /tools/ is deprecated.
Signed-off-by: Fathi Boudra fathi.bou...@linaro.org ---
meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb | 8 1 file
changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb
b/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb index f6ffcb6..9243340
100644 --- a/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb +++
b/meta-oe/recipes-devtools/pm-qa/pm-qa_git.bb @@ -4,14 +4,14 @@
HOMEPAGE =
https://wiki.linaro.org/WorkingGroups/PowerManagement/Resources/Test
LICENSE = GPLv2 LIC_FILES_CHKSUM =
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
-PV = 0.4.9 +PV = 0.4.10
BRANCH ?= master
-# Corresponds to tag pm-qa-v0.4.9 -SRCREV =
c54941a9bbaac33e44e6d0c7f5344e21102642cf +# Corresponds to tag
pm-qa-v0.4.10 +SRCREV = 03a22d5ad7deb6021b2ec1d546a960d8a9878255
-SRC_URI =
git://git.linaro.org/tools/pm-qa.git;protocol=git;branch=${BRANCH}
+SRC_URI =
git://git.linaro.org/power/pm-qa.git;protocol=git;branch=${BRANCH}
Nitpick: protocol=http might be better, git:// is flaky on
git.linaro.org.
I have no problems with merging this with protocol=git
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org
iD8DBQFTe0sIMkyGM64RGpERAuJqAJ0Q7oEp1P+ryEgYaoqgtmVHls9oNQCeMHl3
f7YTME2Qtvw2k4yRxhX3HyY=
=1O0V
-END PGP SIGNATURE-
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Dropped libvorvis dependency because there is already a (better) builtin vorbis
codec.
Don't confuse codec names: vorbis (builtin) and libvorbis (using external
library).
Changes:
- add --enable-nonfree when faac or openssl are used
- add DESCRIPTION
- sort PACKAGECONFIG entries
Tested with libav-0.8.11 libav-9.13.
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta/recipes-multimedia/libav/libav.inc | 39 ++---
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/meta/recipes-multimedia/libav/libav.inc
b/meta/recipes-multimedia/libav/libav.inc
index a05a2a6..0bcdedc 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -1,6 +1,12 @@
-SUMMARY = A complete, cross-platform solution to record, convert and stream
audio and video
+SUMMARY = Open source audio and video processing tools and librairies
+DESCRIPTION = Libav is a friendly and community-driven effort to provide its
users \
+ with a set of portable, functional and high-performance
libraries for \
+ dealing with multimedia formats of all sorts. It originates
from the \
+ FFmpeg codebase, but goes its own way these days, providing its
users \
+ with reliable releases and a clear vision how to go forward.
HOMEPAGE = http://libav.org/;
SECTION = libs
+
LICENSE = GPLv2+
LICENSE_FLAGS = commercial
@@ -9,7 +15,7 @@ PROVIDES = ffmpeg
ARM_INSTRUCTION_SET = arm
-DEPENDS = zlib libogg libvorbis libtheora yasm-native
+DEPENDS = zlib libogg yasm-native
INC_PR = r8
@@ -23,21 +29,29 @@ BUILD_OPTIMIZATION = ${FULL_OPTIMIZATION}
EXTRA_FFCONF_armv7a = --cpu=cortex-a8
EXTRA_FFCONF ?=
-PACKAGECONFIG ??= bzip2 x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11',
'x11', '', d)}
-PACKAGECONFIG[jack] = --enable-indev=jack,--disable-indev=jack,jack
+PACKAGECONFIG ??= bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES',
'x11', 'x11', '', d)}
PACKAGECONFIG[bzip2] = --enable-bzlib,--disable-bzlib,bzip2
-PACKAGECONFIG[schroedinger] =
--enable-libschroedinger,--disable-libschroedinger,schroedinger
+PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
PACKAGECONFIG[gsm] = --enable-libgsm,--disable-libgsm,libgsm
-PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
-PACKAGECONFIG[vpx] = --enable-libvpx,--disable-libvpx,libvpx
+PACKAGECONFIG[jack] = --enable-indev=jack,--disable-indev=jack,jack
+PACKAGECONFIG[libvorbis] = --enable-libvorbis,--disable-libvorbis,libvorbis
PACKAGECONFIG[mp3lame] = --enable-libmp3lame,--disable-libmp3lame,lame
-PACKAGECONFIG[faac] = --enable-libfaac,--disable-libfaac,faac
+PACKAGECONFIG[openssl] = --enable-openssl,--disable-openssl,openssl
+PACKAGECONFIG[schroedinger] =
--enable-libschroedinger,--disable-libschroedinger,schroedinger
+PACKAGECONFIG[speex] = --enable-libspeex,--disable-libspeex,speex
+PACKAGECONFIG[theora] = --enable-libtheora,--disable-libtheora,libtheora
+PACKAGECONFIG[vpx] = --enable-libvpx,--disable-libvpx,libvpx
PACKAGECONFIG[x11] = --enable-x11grab,--disable-x11grab,virtual/libx11
libxfixes libxext xproto virtual/libsdl
+PACKAGECONFIG[x264] = --enable-libx264,--disable-libx264,x264
+
+# Check codecs that require --enable-nonfree
+USE_NONFREE = ${@contains_one('PACKAGECONFIG', [ 'faac', 'openssl' ], d)}
EXTRA_OECONF = \
--enable-shared \
--enable-pthreads \
--enable-gpl \
+${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
--enable-avfilter \
\
--cross-prefix=${TARGET_PREFIX} \
@@ -91,6 +105,15 @@ LEAD_SONAME = libavcodec.so
FILES_${PN}-dev = ${includedir}
+def contains_one(variable, checkvalues, d):
+val = d.getVar(variable, True)
+if not val:
+return ''
+val = set(val.split())
+if val.intersection(checkvalues):
+return 'yes'
+return ''
+
python populate_packages_prepend() {
av_libdir = d.expand('${libdir}')
av_pkgconfig = d.expand('${libdir}/pkgconfig')
--
1.8.1.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Sorry, this patch should have been sent to openembedded-c...@lists.openembedded.org. Regards, Matthieu -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH] faac: fix S!=B failure
Signed-off-by: Matthieu Crapet matthieu.cra...@ingenico.com
---
meta-multimedia/recipes-multimedia/faac/faac_1.28.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
index c7dcdb9..d96c1a4 100644
--- a/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
+++ b/meta-multimedia/recipes-multimedia/faac/faac_1.28.bb
@@ -4,15 +4,15 @@ LICENSE = LGPLv2+
LIC_FILES_CHKSUM = file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
file://libfaac/coder.h;beginline=5;endline=17;md5=fa1fd6a5fa8cdc877d63a12530d273e0
-inherit autotools
+inherit autotools-brokensep
-SRC_URI = ${SOURCEFORGE_MIRROR}/faac/${BPN}-${PV}.tar.gz \
+SRC_URI = ${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \
file://build-fix.patch
SRC_URI[md5sum] = 80763728d392c7d789cde25614c878f6
SRC_URI[sha256sum] =
c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
-PACKAGES =+ lib${PN} lib${PN}-dev
+PACKAGES =+ lib${BPN} lib${BPN}-dev
FILES_${PN} = ${bindir}/faac
FILES_lib${PN} = ${libdir}/libfaac.so.*
--
1.8.1.2
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH] faac: fix S!=B failure
On Tue, May 20, 2014 at 5:56 AM, Matthieu Crapet
matthieu.cra...@ingenico.com wrote:
-SRC_URI = ${SOURCEFORGE_MIRROR}/faac/${BPN}-${PV}.tar.gz \
+SRC_URI = ${SOURCEFORGE_MIRROR}/faac/${BP}.tar.gz \
file://build-fix.patch
SRC_URI[md5sum] = 80763728d392c7d789cde25614c878f6
SRC_URI[sha256sum] =
c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df
-PACKAGES =+ lib${PN} lib${PN}-dev
+PACKAGES =+ lib${BPN} lib${BPN}-dev
these changes should be mentioned in commit message too.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe] [PATCH] nodejs needs python-native
From c13975829fde23138a35d63f2b641fad0fde8c72 Mon Sep 17 00:00:00 2001
From: Amy Fong amy.f...@windriver.com
Date: Tue, 20 May 2014 14:58:54 -0400
Subject: [PATCH] nodejs needs python-native
nodejs should use python from python-native package. On some hosts, the
default python is missing bz2 support.
Signed-off-by: Amy Fong amy.f...@windriver.com
---
meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
index 996d68e..75a9ca4 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_0.8.18.bb
@@ -3,7 +3,7 @@ HOMEPAGE = http://nodejs.org;
LICENSE = MIT BSD
LIC_FILES_CHKSUM = file://LICENSE;md5=95a589a3257ab7dfe37d8a8379e3c72d
-DEPENDS = openssl
+DEPENDS = openssl python-native
SRC_URI = http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
file://0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch \
@@ -28,6 +28,7 @@ do_configure () {
do_compile () {
export LD=${CXX}
+export PATH=${STAGING_BINDIR_NATIVE}/python-native:$PATH
make BUILDTYPE=Release
}
@@ -40,3 +41,5 @@ RDEPENDS_${PN}_class-native =
FILES_${PN} += ${libdir}/node/wafadmin ${libdir}/node_modules
${libdir}/dtrace
BBCLASSEXTEND = native
+
+FILES_${PN} += /usr/lib/*
--
2.0.0.rc0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] nodejs needs python-native
On Tue, May 20, 2014 at 12:03 PM, Amy Fong amy.f...@windriver.com wrote:
-DEPENDS = openssl
+DEPENDS = openssl python-native
may be it should inherit pythonnative
SRC_URI = http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
file://0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch \
@@ -28,6 +28,7 @@ do_configure () {
do_compile () {
export LD=${CXX}
+export PATH=${STAGING_BINDIR_NATIVE}/python-native:$PATH
make BUILDTYPE=Release
}
@@ -40,3 +41,5 @@ RDEPENDS_${PN}_class-native =
FILES_${PN} += ${libdir}/node/wafadmin ${libdir}/node_modules
${libdir}/dtrace
BBCLASSEXTEND = native
+
+FILES_${PN} += /usr/lib/*
make it ${libdir}/* here
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe] [PATCH] nodejs needs python-native
On 2014-05-20 13:28, Khem Raj wrote:
On Tue, May 20, 2014 at 12:03 PM, Amy Fong amy.f...@windriver.com wrote:
-DEPENDS = openssl
+DEPENDS = openssl python-native
may be it should inherit pythonnative
SRC_URI = http://nodejs.org/dist/v${PV}/node-v${PV}.tar.gz \
file://0001-gcc-has-a-builtin-define-to-denote-hard-abi-when-in-.patch \
@@ -28,6 +28,7 @@ do_configure () {
do_compile () {
export LD=${CXX}
+export PATH=${STAGING_BINDIR_NATIVE}/python-native:$PATH
If you inherit pythonnative, this 'export PATH...' is also not necessary
make BUILDTYPE=Release
}
@@ -40,3 +41,5 @@ RDEPENDS_${PN}_class-native =
FILES_${PN} += ${libdir}/node/wafadmin ${libdir}/node_modules
${libdir}/dtrace
BBCLASSEXTEND = native
+
+FILES_${PN} += /usr/lib/*
make it ${libdir}/* here
--
Gary Thomas | Consulting for the
MLB Associates |Embedded world
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 1/2] Support gpsd version 3.10 (fixup patches, refactor to use include file for both 3.7 + 3.10, fix gpsd-doc )
TODO: identify when udev is in use and add support for it automatically
---
...prefix-includepy-with-sysroot-and-drop-sy.patch | 71
...struct-respect-sysroot-also-in-SPLINTOPTS.patch | 30
.../gpsd-3.10/0004-SConstruct-remove-rpath.patch | 42 +
meta-oe/recipes-navigation/gpsd/gpsd.inc | 179
+
meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb | 15 ++
meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb| 140 +---
.../recipes-navigation/gpsd/supported-chipsets.inc | 28
7 files changed, 372 insertions(+), 133 deletions(-)
create mode 100644
meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includepy-
with-sysroot-and-drop-sy.patch
create mode 100644
meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot-a
lso-in-SPLINTOPTS.patch
create mode 100644
meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.patc
h
create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd.inc
create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
create mode 100644 meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
new file mode 100644
index 000..e557703
--- /dev/null
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
@@ -0,0 +1,71 @@
+From dd3ca38b27cce93f7e932abaa27b41371234fa90 Mon Sep 17 00:00:00 2001
+From: Martin Jansa martin.ja...@gmail.com
+Date: Tue, 24 Apr 2012 18:45:14 +0200
+Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop
sysroot
+ from python_lib_dir
+
+* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without
sysroot prefix
+ and with PYTHONPATH from OE it's pointing to native python dir
+
+$ export
PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
+$ python
+Python 2.7.2 (default, Apr 18 2012, 09:19:59)
+[GCC 4.6.2] on linux2
+Type help, copyright, credits or license for more information.
+ from distutils import sysconfig
+ sysconfig.get_config_vars('INCLUDEPY')
+
['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
+
+$ unset PYTHONPATH
+$ python
+Python 2.7.2 (default, Apr 18 2012, 09:19:59)
+[GCC 4.6.2] on linux2
+Type help, copyright, credits or license for more information.
+ from distutils import sysconfig
+ sysconfig.get_config_vars('INCLUDEPY')
+['/python2.7']
+ import sysconfig
+ sysconfig.get_config_vars('INCLUDEPY')
+
['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
+* python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
+ returns path to target sysroot
+
+Signed-off-by: Martin Jansa martin.ja...@gmail.com
+---
+ SConstruct |9 +
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 14e2f59..47c5753 100644
+--- a/SConstruct
b/SConstruct
+@@ -1084,6 +1084,10 @@ else:
+ if vars[i] is None:
+ vars[i] = []
+ (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy,
ldflags) = vars
++if env['sysroot']:
++ print Prefixing includepy '%s' with sysroot prefix % includepy
++ includepy = os.path.normpath(%s/%s/%s/%s % (env['sysroot'],
env['prefix'], env['includedir'], includepy))
++ print '%s' % includepy
+ # FIXME: build of python wrappers doesn't pickup flags set for
coveraging, manually add them here
+ if env['coveraging']:
+ basecflags += ' -coverage'
+@@ -1350,11 +1358,14 @@ if not env['python']:
+ python_install = []
+ else:
+ python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
++python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
+ python_module_dir = python_lib_dir + os.sep + 'gps'
+ python_extensions_install = python_env.Install( DESTDIR +
python_module_dir,
+
python_built_extensions)
+ if not env['debug'] and not env['profiling'] and env['strip']:
+ python_env.AddPostAction(python_extensions_install, '$STRIP
$TARGET')
++env.AddPostAction(python_extensions_install, '$CHRPATH -r %s
$TARGET' \
++ % (python_lib_dir, ))
+
+ python_modules_install = python_env.Install( DESTDIR +
python_module_dir,
+ python_modules)
+
+--
+1.7.8.5
+
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
new file mode 100644
index 000..06dd6e7
--- /dev/null
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
@@ -0,0 +1,30 @@
+From
[oe] [meta-oe][PATCH 2/2] fixup trailing-whitespace following warning from create-pull-request
---
...0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch | 5
++---
.../0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch | 3 +--
.../gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.patch | 7
+++
meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb | 2 --
meta-oe/recipes-navigation/gpsd/supported-chipsets.inc | 1 -
5 files changed, 6 insertions(+), 12 deletions(-)
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
index e557703..1328cf4 100644
---
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includep
y-with-sysroot-and-drop-sy.patch
@@ -62,10 +62,9 @@ index 14e2f59..47c5753 100644
python_env.AddPostAction(python_extensions_install, '$STRIP
$TARGET')
+env.AddPostAction(python_extensions_install, '$CHRPATH -r %s
$TARGET' \
+ % (python_lib_dir, ))
-
+
python_modules_install = python_env.Install( DESTDIR +
python_module_dir,
python_modules)
---
+--
1.7.8.5
-
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
index 06dd6e7..a6a9376 100644
---
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot
-also-in-SPLINTOPTS.patch
@@ -25,6 +25,5 @@ index 14e2f59..47c5753 100644
# splint does not know about multi-arch, work around that
ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH')
if ma_status == 0:
---
+--
1.7.5.4
-
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.pa
tch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.pa
tch
index 83b98bb..a3e8bdb 100644
---
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.pa
tch
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.pa
tch
@@ -24,7 +24,7 @@ index a1bddb9..3e7c607 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1205,8 +1205,11 @@ if qt_env:
-
+
# We don't use installdir here in order to avoid having DESTDIR affect
the rpath
if env[shared] and env[chrpath]:
-env.AddPostAction(binaryinstall, '$CHRPATH -r %s $TARGET' \
@@ -34,9 +34,8 @@ index a1bddb9..3e7c607 100644
+ % (installdir('libdir', False), ))
+else:
+env.AddPostAction(binaryinstall, '$CHRPATH -d $TARGET')
-
+
if not env['debug'] and not env['profiling'] and env['strip']:
env.AddPostAction(binaryinstall, '$STRIP $TARGET')
---
+--
1.7.5.4
-
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
index 715b5a7..55e59d3 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
@@ -11,5 +11,3 @@ PR = r1
SRC_URI[md5sum] = fc5b03aae38b9b5b6880b31924d0ace3
SRC_URI[sha256sum] =
706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320
-
-
diff --git a/meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
b/meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
index dee898b..90eaa49 100644
--- a/meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
+++ b/meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
@@ -25,4 +25,3 @@ PACKAGECONFIG += tnt
PACKAGECONFIG += tripmate
PACKAGECONFIG += tsip
PACKAGECONFIG += ublox
-
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-oe][PATCH 0/2] gpsd: support gpsd version 3.10
These changes add support for gpsd version 3.10 and adds gpsctl to the
base gpsd package. gpsctl is used to set chipset settings using gpsd.
Recipe is located in meta-oe/meta-oe/recipes-navigation/gpsd.
This commit does include hand merge of
04dcd55c9d293a26a925377055660310bd229b1b
(change of $SRC_URI to ${SAVANNAH_GNU_MIRROR}/${PN}/${P}.tar.gz) but I
have
not been able to test that because poky master currently errors out for
reasons unrelated to this change.
The following changes since commit
6434d97ee958e7f597b9cf358db0275315a33c47:
log4cplus: use better file for LIC_FILES_CHKSUM (2014-05-15 12:30:22
+0200)
are available in the git repository at:
git://github.com/ShotSpotter/meta-oe gpsd
https://github.com/ShotSpotter/meta-oe/tree/gpsd
Rob Calhoun (2):
* Support gpsd version 3.10
* Refactor recipe into version-specific file and version-independent
include file
* Add explicit list of supported devices/chipsets. By default gpsd
compiles in support for all known devices. By overriding this
list, support for unwanted devices/chipsets can be dropped.
* Make version-specific patch directories and test 3.7 patches against
3.10;
* remove patch present in 3.7 recipe that disabled build of
gpsd-doc because manfile generation now runs without error. Other
patches appear to still be necessary
* Fixup patch files so that they apply cleanly to gpsd 3.10 source.
* refactor gpsd 3.7 recipe so that it refers to include file.
* bump 3.7 $PR to r15 to show 3.7 recipe has changed substantially
* set 3.10 $PR to r1 because this is a new version
* fixup trailing-whitespace following warning from create-pull-request
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH 1/2] * Support gpsd version 3.10 * Refactor recipe into version-specific file and version-independent include file * Add explicit list of supported devices/chipsets. By defaul
Missing subject line and please squash 2/2 into this. Please reply when
you were able to test it (build-time and run-time).
On Tue, May 20, 2014 at 12:54:47PM -0700, Rob Calhoun wrote:
TODO: identify when udev is in use and add support for it automatically
---
...prefix-includepy-with-sysroot-and-drop-sy.patch | 71
...struct-respect-sysroot-also-in-SPLINTOPTS.patch | 30
.../gpsd-3.10/0004-SConstruct-remove-rpath.patch | 42 +
meta-oe/recipes-navigation/gpsd/gpsd.inc | 179
+
meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb | 15 ++
meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb| 140 +---
.../recipes-navigation/gpsd/supported-chipsets.inc | 28
7 files changed, 372 insertions(+), 133 deletions(-)
create mode 100644
meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
create mode 100644
meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch
create mode 100644
meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-remove-rpath.patch
create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd.inc
create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb
create mode 100644 meta-oe/recipes-navigation/gpsd/supported-chipsets.inc
diff --git
a/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
new file mode 100644
index 000..e557703
--- /dev/null
+++
b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch
@@ -0,0 +1,71 @@
+From dd3ca38b27cce93f7e932abaa27b41371234fa90 Mon Sep 17 00:00:00 2001
+From: Martin Jansa martin.ja...@gmail.com
+Date: Tue, 24 Apr 2012 18:45:14 +0200
+Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot
+ from python_lib_dir
+
+* without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot
prefix
+ and with PYTHONPATH from OE it's pointing to native python dir
+
+$ export
PYTHONPATH=/OE/shr-core/tmp-eglibc/sysroots/om-gta02/usr/lib/python2.7/
+$ python
+Python 2.7.2 (default, Apr 18 2012, 09:19:59)
+[GCC 4.6.2] on linux2
+Type help, copyright, credits or license for more information.
+ from distutils import sysconfig
+ sysconfig.get_config_vars('INCLUDEPY')
+['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
+
+$ unset PYTHONPATH
+$ python
+Python 2.7.2 (default, Apr 18 2012, 09:19:59)
+[GCC 4.6.2] on linux2
+Type help, copyright, credits or license for more information.
+ from distutils import sysconfig
+ sysconfig.get_config_vars('INCLUDEPY')
+['/python2.7']
+ import sysconfig
+ sysconfig.get_config_vars('INCLUDEPY')
+['/OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/include/python2.7']
+* python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
+ returns path to target sysroot
+
+Signed-off-by: Martin Jansa martin.ja...@gmail.com
+---
+ SConstruct |9 +
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 14e2f59..47c5753 100644
+--- a/SConstruct
b/SConstruct
+@@ -1084,6 +1084,10 @@ else:
+ if vars[i] is None:
+ vars[i] = []
+ (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy,
ldflags) = vars
++if env['sysroot']:
++ print Prefixing includepy '%s' with sysroot prefix % includepy
++ includepy = os.path.normpath(%s/%s/%s/%s % (env['sysroot'],
env['prefix'], env['includedir'], includepy))
++ print '%s' % includepy
+ # FIXME: build of python wrappers doesn't pickup flags set for
coveraging, manually add them here
+ if env['coveraging']:
+ basecflags += ' -coverage'
+@@ -1350,11 +1358,14 @@ if not env['python']:
+ python_install = []
+ else:
+ python_lib_dir = sysconfig.get_python_lib(plat_specific=1)
++python_lib_dir = python_lib_dir.replace(env['sysroot'], '')
+ python_module_dir = python_lib_dir + os.sep + 'gps'
+ python_extensions_install = python_env.Install( DESTDIR +
python_module_dir,
+ python_built_extensions)
+ if not env['debug'] and not env['profiling'] and env['strip']:
+ python_env.AddPostAction(python_extensions_install, '$STRIP
$TARGET')
++env.AddPostAction(python_extensions_install, '$CHRPATH -r %s
$TARGET' \
++ % (python_lib_dir, ))
+
+ python_modules_install = python_env.Install( DESTDIR +
python_module_dir,
+ python_modules)
+
+--
+1.7.8.5
+
diff --git
