diff options
Diffstat (limited to 'meta-oe/recipes-navigation/gpsd')
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch (renamed from meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch) | 32 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0002-include-sys-ttydefaults.h.patch (renamed from meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0003-SConstruct-disable-html-and-man-docs-building-becaus.patch (renamed from meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb (renamed from meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb) | 15 |
4 files changed, 23 insertions, 24 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch index 1fa27c210d..23ae5e509d 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch @@ -1,4 +1,4 @@ -From 1e2cea8945bc2183fbe1a012dcd633a352125952 Mon Sep 17 00:00:00 2001 +From 5464d9e1bfd1a1c54338ec7c4148cad1b222ef93 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Tue, 24 Apr 2012 18:45:14 +0200 Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot @@ -34,15 +34,16 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Peter A. Bigot <pab@pabigot.com> + --- - SConstruct | 9 +++++++++ - 1 file changed, 9 insertions(+) + SConstruct | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct -index 3318bb48..e1c4f963 100644 +index b8f3fb1..883e06d 100644 --- a/SConstruct +++ b/SConstruct -@@ -934,7 +934,7 @@ else: +@@ -980,7 +980,7 @@ else: # Set up configuration for target Python @@ -51,7 +52,7 @@ index 3318bb48..e1c4f963 100644 PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS', 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS'] -@@ -1364,7 +1364,7 @@ else: +@@ -1506,7 +1506,7 @@ else: LINK=ldshared, SHLIBPREFIX="", SHLIBSUFFIX=python_config['SO'], @@ -60,22 +61,19 @@ index 3318bb48..e1c4f963 100644 CPPFLAGS=python_config['OPT'], CFLAGS=python_config['BASECFLAGS'], CXXFLAGS=python_config['BASECFLAGS']) -@@ -1662,12 +1662,15 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] - if not env['python']: - python_install = [] - else: -+ python_libdir = python_libdir.replace(env['sysroot'], '') - python_module_dir = python_libdir + os.sep + 'gps' +@@ -1808,12 +1808,14 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] and + env.AddPostAction(binaryinstall, '$STRIP $TARGET') + + if env['python']: +- python_module_dir = str(python_libdir) + os.sep + 'gps' ++ python_module_dir = python_libdir.replace(env['sysroot'], '') + 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 not env['nostrip'] and not sys.platform.startswith('darwin'))): + if ((not env['debug'] and not env['profiling'] and + not env['nostrip'] and not sys.platform.startswith('darwin'))): python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') + env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ + % (python_libdir, )) python_modules_install = python_env.Install(DESTDIR + python_module_dir, python_modules) --- -2.1.0 - diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0002-include-sys-ttydefaults.h.patch index e91e4e9fbd..e91e4e9fbd 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0001-include-sys-ttydefaults.h.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0002-include-sys-ttydefaults.h.patch diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0003-SConstruct-disable-html-and-man-docs-building-becaus.patch index ba3d205d10..ba3d205d10 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.17/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.18.1/0003-SConstruct-disable-html-and-man-docs-building-becaus.patch diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb index 7e11224574..22097e3aa4 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.17.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.18.1.bb @@ -13,11 +13,11 @@ EXTRANATIVEPATH += "chrpath-native" SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ - file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \ - file://0001-include-sys-ttydefaults.h.patch \ + file://0002-include-sys-ttydefaults.h.patch \ + file://0003-SConstruct-disable-html-and-man-docs-building-becaus.patch \ " -SRC_URI[md5sum] = "e0cfadcf4a65dfbdd2afb11c58f4e4a1" -SRC_URI[sha256sum] = "68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a" +SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" +SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" inherit scons update-rc.d python-dir pythonnative systemd bluetooth update-alternatives @@ -61,7 +61,7 @@ do_install() { export DESTDIR="${D}" # prefix is used for RPATH and DESTDIR/prefix for instalation - ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ + ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} python_libdir=${libdir} install ${EXTRA_OESCONS} || \ bbfatal "scons install execution failed." } @@ -116,11 +116,12 @@ SUMMARY_gpsd-gpsctl = "Tool for tweaking GPS modes" FILES_gpsd-gpsctl = "${bindir}/gpsctl" SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" -FILES_gps-utils = "${bindir}/*" +# Python files are required for gps/fake, required for gpsfake. +FILES_gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" RDEPENDS_gps-utils = "python-pygps" SUMMARY_python-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" RDEPENDS_python-pygps = " \ python-core \ python-io \ |