diff options
author | Alistair Francis <alistair@alistair23.me> | 2019-06-25 15:07:00 +0000 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-06-25 14:21:48 -0700 |
commit | bcee75b765a9d75209ce6ce173023998e3981e52 (patch) | |
tree | a4204575c6f4acca073b3dd22f4f62080b5e57ea /meta-oe/recipes-navigation | |
parent | 50727a227b866f26dc381dff5aff6d21a904e522 (diff) | |
download | meta-openembedded-bcee75b765a9d75209ce6ce173023998e3981e52.tar.gz |
gpsd: Upgrade from 3.17 to 3.18.1
Signed-off-by: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-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 1fa27c210..23ae5e509 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 @@ | |||
1 | From 1e2cea8945bc2183fbe1a012dcd633a352125952 Mon Sep 17 00:00:00 2001 | 1 | From 5464d9e1bfd1a1c54338ec7c4148cad1b222ef93 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Tue, 24 Apr 2012 18:45:14 +0200 | 3 | Date: Tue, 24 Apr 2012 18:45:14 +0200 |
4 | Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot | 4 | Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot |
@@ -34,15 +34,16 @@ Upstream-Status: Inappropriate [embedded specific] | |||
34 | 34 | ||
35 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 35 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
36 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | 36 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> |
37 | |||
37 | --- | 38 | --- |
38 | SConstruct | 9 +++++++++ | 39 | SConstruct | 8 +++++--- |
39 | 1 file changed, 9 insertions(+) | 40 | 1 file changed, 5 insertions(+), 3 deletions(-) |
40 | 41 | ||
41 | diff --git a/SConstruct b/SConstruct | 42 | diff --git a/SConstruct b/SConstruct |
42 | index 3318bb48..e1c4f963 100644 | 43 | index b8f3fb1..883e06d 100644 |
43 | --- a/SConstruct | 44 | --- a/SConstruct |
44 | +++ b/SConstruct | 45 | +++ b/SConstruct |
45 | @@ -934,7 +934,7 @@ else: | 46 | @@ -980,7 +980,7 @@ else: |
46 | 47 | ||
47 | # Set up configuration for target Python | 48 | # Set up configuration for target Python |
48 | 49 | ||
@@ -51,7 +52,7 @@ index 3318bb48..e1c4f963 100644 | |||
51 | 52 | ||
52 | PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS', | 53 | PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS', |
53 | 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS'] | 54 | 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS'] |
54 | @@ -1364,7 +1364,7 @@ else: | 55 | @@ -1506,7 +1506,7 @@ else: |
55 | LINK=ldshared, | 56 | LINK=ldshared, |
56 | SHLIBPREFIX="", | 57 | SHLIBPREFIX="", |
57 | SHLIBSUFFIX=python_config['SO'], | 58 | SHLIBSUFFIX=python_config['SO'], |
@@ -60,22 +61,19 @@ index 3318bb48..e1c4f963 100644 | |||
60 | CPPFLAGS=python_config['OPT'], | 61 | CPPFLAGS=python_config['OPT'], |
61 | CFLAGS=python_config['BASECFLAGS'], | 62 | CFLAGS=python_config['BASECFLAGS'], |
62 | CXXFLAGS=python_config['BASECFLAGS']) | 63 | CXXFLAGS=python_config['BASECFLAGS']) |
63 | @@ -1662,12 +1662,15 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] | 64 | @@ -1808,12 +1808,14 @@ if ((not env['debug'] and not env['profiling'] and not env['nostrip'] and |
64 | if not env['python']: | 65 | env.AddPostAction(binaryinstall, '$STRIP $TARGET') |
65 | python_install = [] | 66 | |
66 | else: | 67 | if env['python']: |
67 | + python_libdir = python_libdir.replace(env['sysroot'], '') | 68 | - python_module_dir = str(python_libdir) + os.sep + 'gps' |
68 | python_module_dir = python_libdir + os.sep + 'gps' | 69 | + python_module_dir = python_libdir.replace(env['sysroot'], '') + os.sep + 'gps' |
69 | python_extensions_install = python_env.Install(DESTDIR + python_module_dir, | 70 | python_extensions_install = python_env.Install(DESTDIR + python_module_dir, |
70 | python_built_extensions) | 71 | python_built_extensions) |
71 | if ((not env['debug'] and not env['profiling'] | 72 | if ((not env['debug'] and not env['profiling'] and |
72 | and not env['nostrip'] and not sys.platform.startswith('darwin'))): | 73 | not env['nostrip'] and not sys.platform.startswith('darwin'))): |
73 | python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') | 74 | python_env.AddPostAction(python_extensions_install, '$STRIP $TARGET') |
74 | + env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ | 75 | + env.AddPostAction(python_extensions_install, '$CHRPATH -r "%s" "$TARGET"' \ |
75 | + % (python_libdir, )) | 76 | + % (python_libdir, )) |
76 | 77 | ||
77 | python_modules_install = python_env.Install(DESTDIR + python_module_dir, | 78 | python_modules_install = python_env.Install(DESTDIR + python_module_dir, |
78 | python_modules) | 79 | python_modules) |
79 | -- | ||
80 | 2.1.0 | ||
81 | |||
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 e91e4e9fb..e91e4e9fb 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 ba3d205d1..ba3d205d1 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 7e1122457..22097e3aa 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" | |||
13 | 13 | ||
14 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | 14 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ |
15 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ | 15 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ |
16 | file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \ | 16 | file://0002-include-sys-ttydefaults.h.patch \ |
17 | file://0001-include-sys-ttydefaults.h.patch \ | 17 | file://0003-SConstruct-disable-html-and-man-docs-building-becaus.patch \ |
18 | " | 18 | " |
19 | SRC_URI[md5sum] = "e0cfadcf4a65dfbdd2afb11c58f4e4a1" | 19 | SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" |
20 | SRC_URI[sha256sum] = "68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a" | 20 | SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" |
21 | 21 | ||
22 | inherit scons update-rc.d python-dir pythonnative systemd bluetooth update-alternatives | 22 | inherit scons update-rc.d python-dir pythonnative systemd bluetooth update-alternatives |
23 | 23 | ||
@@ -61,7 +61,7 @@ do_install() { | |||
61 | 61 | ||
62 | export DESTDIR="${D}" | 62 | export DESTDIR="${D}" |
63 | # prefix is used for RPATH and DESTDIR/prefix for instalation | 63 | # prefix is used for RPATH and DESTDIR/prefix for instalation |
64 | ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ | 64 | ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} python_libdir=${libdir} install ${EXTRA_OESCONS} || \ |
65 | bbfatal "scons install execution failed." | 65 | bbfatal "scons install execution failed." |
66 | } | 66 | } |
67 | 67 | ||
@@ -116,11 +116,12 @@ SUMMARY_gpsd-gpsctl = "Tool for tweaking GPS modes" | |||
116 | FILES_gpsd-gpsctl = "${bindir}/gpsctl" | 116 | FILES_gpsd-gpsctl = "${bindir}/gpsctl" |
117 | 117 | ||
118 | SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" | 118 | SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" |
119 | FILES_gps-utils = "${bindir}/*" | 119 | # Python files are required for gps/fake, required for gpsfake. |
120 | FILES_gps-utils = "${bindir}/* ${libdir}/gps/*.py ${libdir}/gps/*.so" | ||
120 | RDEPENDS_gps-utils = "python-pygps" | 121 | RDEPENDS_gps-utils = "python-pygps" |
121 | 122 | ||
122 | SUMMARY_python-pygps = "Python bindings to gpsd" | 123 | SUMMARY_python-pygps = "Python bindings to gpsd" |
123 | FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" | 124 | FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir}/*.egg-info" |
124 | RDEPENDS_python-pygps = " \ | 125 | RDEPENDS_python-pygps = " \ |
125 | python-core \ | 126 | python-core \ |
126 | python-io \ | 127 | python-io \ |