diff options
author | Peter Bigot <pab@pabigot.com> | 2014-08-28 07:06:18 -0500 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-09-01 11:37:11 +0200 |
commit | 3bd654324cdf2485249b1dcb49d2da8a7ded41d1 (patch) | |
tree | 14bd2222885eda127086e77e3b98f9b6b057639f /meta-oe/recipes-navigation | |
parent | 6bea4ca22eb0ee33a1d9f6d6dd2d4a978a261515 (diff) | |
download | meta-openembedded-3bd654324cdf2485249b1dcb49d2da8a7ded41d1.tar.gz |
gpsd: update to 3.10
Patches rebased onto new version with no material changes.
Signed-off-by: Peter A. Bigot <pab@pabigot.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch (renamed from meta-oe/recipes-navigation/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch) | 19 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-remove-rpath.patch (renamed from meta-oe/recipes-navigation/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch) | 19 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.10/0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch (renamed from meta-oe/recipes-navigation/gpsd/gpsd-3.7/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch) | 27 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch (renamed from meta-oe/recipes-navigation/gpsd/gpsd-3.7/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch) | 43 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb (renamed from meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb) | 14 |
5 files changed, 66 insertions, 56 deletions
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch index 40baa0194..c4134f4b5 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch | |||
@@ -1,22 +1,25 @@ | |||
1 | From f5f262be8ae54bd0c0f52802f2007ec89163756f Mon Sep 17 00:00:00 2001 | 1 | From 3c5fb3a8691ac711ea93edf8e0b42bffc62b197e 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 11:52:35 +0200 | 3 | Date: Tue, 24 Apr 2012 11:52:35 +0200 |
4 | Subject: [PATCH 1/2] SConstruct: respect sysroot also in SPLINTOPTS | 4 | Subject: [PATCH 1/4] SConstruct: respect sysroot also in SPLINTOPTS |
5 | |||
6 | Upstream-Status: Inappropriate [embedded specific] | ||
5 | 7 | ||
6 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 8 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
7 | Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 9 | Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> |
10 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
8 | --- | 11 | --- |
9 | SConstruct | 5 ++++- | 12 | SConstruct | 5 ++++- |
10 | 1 files changed, 4 insertions(+), 1 deletions(-) | 13 | 1 file changed, 4 insertions(+), 1 deletion(-) |
11 | 14 | ||
12 | diff --git a/SConstruct b/SConstruct | 15 | diff --git a/SConstruct b/SConstruct |
13 | index a25e88a..a1bddb9 100644 | 16 | index 14e2f59..f0cafa8 100644 |
14 | --- a/SConstruct | 17 | --- a/SConstruct |
15 | +++ b/SConstruct | 18 | +++ b/SConstruct |
16 | @@ -1277,7 +1277,10 @@ def Utility(target, source, action): | 19 | @@ -1414,7 +1414,10 @@ def Utility(target, source, action): |
17 | |||
18 | # Report splint warnings | 20 | # Report splint warnings |
19 | # Note: test_bits.c is unsplintable because of the PRI64 macros. | 21 | # Note: test_bits.c is unsplintable because of the PRI64 macros. |
22 | # If you get preprocessor or fatal errors, add +showscan. | ||
20 | -splintopts = "-I/usr/include/libusb-1.0 +quiet" | 23 | -splintopts = "-I/usr/include/libusb-1.0 +quiet" |
21 | +if not env['sysroot']: | 24 | +if not env['sysroot']: |
22 | + splintopts = "-I/usr/include/libusb-1.0 +quiet" | 25 | + splintopts = "-I/usr/include/libusb-1.0 +quiet" |
@@ -26,5 +29,5 @@ index a25e88a..a1bddb9 100644 | |||
26 | ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH') | 29 | ma_status, ma = _getstatusoutput('dpkg-architecture -qDEB_HOST_MULTIARCH') |
27 | if ma_status == 0: | 30 | if ma_status == 0: |
28 | -- | 31 | -- |
29 | 1.7.5.4 | 32 | 1.8.5.5 |
30 | 33 | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-remove-rpath.patch index 83b98bb5e..083a6621f 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0004-SConstruct-remove-rpath.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0002-SConstruct-remove-rpath.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 7d736bbd517c12d19d7b85a5b0db84732b2f86da Mon Sep 17 00:00:00 2001 | 1 | From d090638ff983e509162d5e3b62aa4918de4aa5fa 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 16:24:35 +0200 | 3 | Date: Tue, 24 Apr 2012 16:24:35 +0200 |
4 | Subject: [PATCH 2/2] SConstruct: remove rpath | 4 | Subject: [PATCH 2/4] SConstruct: remove rpath |
5 | 5 | ||
6 | * even with correct prefix (without DESTDIR) included it's redundant | 6 | * even with correct prefix (without DESTDIR) included it's redundant |
7 | WARNING: QA Issue: libgps: | 7 | WARNING: QA Issue: libgps: |
@@ -13,19 +13,22 @@ Subject: [PATCH 2/2] SConstruct: remove rpath | |||
13 | in file | 13 | in file |
14 | /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 | 14 | /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 |
15 | 15 | ||
16 | Upstream-Status: Inapppropriate [embedded specific] | ||
17 | |||
16 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 18 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
17 | Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 19 | Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> |
20 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
18 | --- | 21 | --- |
19 | SConstruct | 7 +++++-- | 22 | SConstruct | 7 +++++-- |
20 | 1 files changed, 5 insertions(+), 2 deletions(-) | 23 | 1 file changed, 5 insertions(+), 2 deletions(-) |
21 | 24 | ||
22 | diff --git a/SConstruct b/SConstruct | 25 | diff --git a/SConstruct b/SConstruct |
23 | index a1bddb9..3e7c607 100644 | 26 | index f0cafa8..ff46713 100644 |
24 | --- a/SConstruct | 27 | --- a/SConstruct |
25 | +++ b/SConstruct | 28 | +++ b/SConstruct |
26 | @@ -1205,8 +1205,11 @@ if qt_env: | 29 | @@ -1340,8 +1340,11 @@ if qt_env: |
30 | binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib)) | ||
27 | 31 | ||
28 | # We don't use installdir here in order to avoid having DESTDIR affect the rpath | ||
29 | if env["shared"] and env["chrpath"]: | 32 | if env["shared"] and env["chrpath"]: |
30 | - env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ | 33 | - env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ |
31 | - % (installdir('libdir', False), )) | 34 | - % (installdir('libdir', False), )) |
@@ -38,5 +41,5 @@ index a1bddb9..3e7c607 100644 | |||
38 | if not env['debug'] and not env['profiling'] and env['strip']: | 41 | if not env['debug'] and not env['profiling'] and env['strip']: |
39 | env.AddPostAction(binaryinstall, '$STRIP $TARGET') | 42 | env.AddPostAction(binaryinstall, '$STRIP $TARGET') |
40 | -- | 43 | -- |
41 | 1.7.5.4 | 44 | 1.8.5.5 |
42 | 45 | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch index c6eb03bf2..1d8c14b57 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch | |||
@@ -1,8 +1,8 @@ | |||
1 | From dd3ca38b27cce93f7e932abaa27b41371234fa90 Mon Sep 17 00:00:00 2001 | 1 | From ad7b06d375730b30f181c5efb3bf21418f296f73 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 3/4] SConstruct: prefix includepy with sysroot and drop |
5 | from python_lib_dir | 5 | sysroot from python_lib_dir |
6 | 6 | ||
7 | * without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix | 7 | * without PYTHONPATH, distutil's sysconfig returns INCLUDEPY without sysroot prefix |
8 | and with PYTHONPATH from OE it's pointing to native python dir | 8 | and with PYTHONPATH from OE it's pointing to native python dir |
@@ -30,19 +30,22 @@ Subject: [PATCH] SConstruct: prefix includepy with sysroot and drop sysroot | |||
30 | * python_lib_dir = python_lib_dir.replace(env['sysroot'], '') | 30 | * python_lib_dir = python_lib_dir.replace(env['sysroot'], '') |
31 | returns path to target sysroot | 31 | returns path to target sysroot |
32 | 32 | ||
33 | Upstream-Status: Inappropriate [embedded specific] | ||
34 | |||
33 | 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> | ||
34 | --- | 37 | --- |
35 | SConstruct | 9 +++++++++ | 38 | SConstruct | 9 +++++++++ |
36 | 1 files changed, 9 insertions(+), 0 deletions(-) | 39 | 1 file changed, 9 insertions(+) |
37 | 40 | ||
38 | diff --git a/SConstruct b/SConstruct | 41 | diff --git a/SConstruct b/SConstruct |
39 | index 3c919fc..8478181 100644 | 42 | index ff46713..0e518e7 100644 |
40 | --- a/SConstruct | 43 | --- a/SConstruct |
41 | +++ b/SConstruct | 44 | +++ b/SConstruct |
42 | @@ -932,6 +932,12 @@ else: | 45 | @@ -1089,6 +1089,12 @@ else: |
43 | if vars[i] is None: | 46 | basecflags += ' -coverage' |
44 | vars[i] = [] | 47 | ldflags += ' -coverage' |
45 | (cc, cxx, opt, basecflags, ccshared, ldshared, so_ext, includepy, ldflags) = vars | 48 | ldshared += ' -coverage' |
46 | + | 49 | + |
47 | + if env['sysroot']: | 50 | + if env['sysroot']: |
48 | + print "Prefixing includepy '%s' with sysroot prefix" % includepy | 51 | + print "Prefixing includepy '%s' with sysroot prefix" % includepy |
@@ -52,7 +55,7 @@ index 3c919fc..8478181 100644 | |||
52 | # in case CC/CXX was set to the scan-build wrapper, | 55 | # in case CC/CXX was set to the scan-build wrapper, |
53 | # ensure that we build the python modules with scan-build, too | 56 | # ensure that we build the python modules with scan-build, too |
54 | if env['CC'] is None or env['CC'].find('scan-build') < 0: | 57 | if env['CC'] is None or env['CC'].find('scan-build') < 0: |
55 | @@ -1165,11 +1171,14 @@ if not env['python']: | 58 | @@ -1353,11 +1359,14 @@ if not env['python']: |
56 | python_install = [] | 59 | python_install = [] |
57 | else: | 60 | else: |
58 | python_lib_dir = sysconfig.get_python_lib(plat_specific=1) | 61 | python_lib_dir = sysconfig.get_python_lib(plat_specific=1) |
@@ -68,5 +71,5 @@ index 3c919fc..8478181 100644 | |||
68 | python_modules_install = python_env.Install( DESTDIR + python_module_dir, | 71 | python_modules_install = python_env.Install( DESTDIR + python_module_dir, |
69 | python_modules) | 72 | python_modules) |
70 | -- | 73 | -- |
71 | 1.7.8.5 | 74 | 1.8.5.5 |
72 | 75 | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch index 9db24326c..8527f0db3 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd-3.7/0001-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.10/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From ca1a781afbd68697ef2f573557f1f93ec7ab8d3c Mon Sep 17 00:00:00 2001 | 1 | From 697e2e9ff97487266d817cdd41bacc83f681e3d7 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: Sun, 29 Apr 2012 00:05:59 +0200 | 3 | Date: Sun, 29 Apr 2012 00:05:59 +0200 |
4 | Subject: [PATCH] SConstruct: disable html and man docs building because | 4 | Subject: [PATCH 4/4] SConstruct: disable html and man docs building because |
5 | xmlto-native from OE is broken | 5 | xmlto-native from OE is broken |
6 | 6 | ||
7 | It will try to load dtd and fail: | 7 | It will try to load dtd and fail: |
@@ -20,30 +20,33 @@ It will try to load dtd and fail: | |||
20 | | scons: *** [gpsctl.1] Error 1 | 20 | | scons: *** [gpsctl.1] Error 1 |
21 | | scons: building terminated because of errors. | 21 | | scons: building terminated because of errors. |
22 | 22 | ||
23 | Upstream-Status: Inappropriate [disable feature] | ||
24 | |||
23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 25 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
26 | Signed-off-by: Peter A. Bigot <pab@pabigot.com> | ||
24 | --- | 27 | --- |
25 | SConstruct | 4 ++-- | 28 | SConstruct | 4 ++-- |
26 | 1 files changed, 2 insertions(+), 2 deletions(-) | 29 | 1 file changed, 2 insertions(+), 2 deletions(-) |
27 | 30 | ||
28 | diff --git a/SConstruct b/SConstruct | 31 | diff --git a/SConstruct b/SConstruct |
29 | index 9c0f751..8236abb 100644 | 32 | index 0e518e7..c01a71b 100644 |
30 | --- a/SConstruct | 33 | --- a/SConstruct |
31 | +++ b/SConstruct | 34 | +++ b/SConstruct |
32 | @@ -560,12 +560,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); | 35 | @@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); |
33 | |||
34 | 36 | ||
35 | manbuilder = mangenerator = htmlbuilder = None | 37 | manbuilder = mangenerator = htmlbuilder = None |
36 | -if config.CheckXsltproc(): | 38 | if env['manbuild']: |
37 | +if False and config.CheckXsltproc(): | 39 | - if config.CheckXsltproc(): |
38 | mangenerator = 'xsltproc' | 40 | + if False and config.CheckXsltproc(): |
39 | build = "xsltproc --nonet %s $SOURCE >$TARGET" | 41 | mangenerator = 'xsltproc' |
40 | htmlbuilder = build % docbook_html_uri | 42 | build = "xsltproc --nonet %s $SOURCE >$TARGET" |
41 | manbuilder = build % docbook_man_uri | 43 | htmlbuilder = build % docbook_html_uri |
42 | -elif WhereIs("xmlto"): | 44 | manbuilder = build % docbook_man_uri |
43 | +elif False and WhereIs("xmlto"): | 45 | - elif WhereIs("xmlto"): |
44 | mangenerator = 'xmlto' | 46 | + elif False and WhereIs("xmlto"): |
45 | htmlbuilder = "xmlto html-nochunks $SOURCE; mv `basename $TARGET` $TARGET" | 47 | mangenerator = 'xmlto' |
46 | manbuilder = "xmlto man $SOURCE; mv `basename $TARGET` $TARGET" | 48 | xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`" |
49 | htmlbuilder = xmlto % "html-nochunks" | ||
47 | -- | 50 | -- |
48 | 1.7.8.6 | 51 | 1.8.5.5 |
49 | 52 | ||
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb index 8c6a6f76a..d12c7a80e 100644 --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.7.bb +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.10.bb | |||
@@ -7,20 +7,18 @@ PROVIDES = "virtual/gpsd" | |||
7 | 7 | ||
8 | EXTRANATIVEPATH += "chrpath-native" | 8 | EXTRANATIVEPATH += "chrpath-native" |
9 | 9 | ||
10 | PR = "r14" | ||
11 | |||
12 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ | 10 | SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ |
13 | file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ | 11 | file://0001-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ |
14 | file://0004-SConstruct-remove-rpath.patch \ | 12 | file://0002-SConstruct-remove-rpath.patch \ |
15 | file://0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ | 13 | file://0003-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch \ |
16 | file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ | 14 | file://0004-SConstruct-disable-html-and-man-docs-building-becaus.patch \ |
17 | file://gpsd-default \ | 15 | file://gpsd-default \ |
18 | file://gpsd \ | 16 | file://gpsd \ |
19 | file://60-gpsd.rules \ | 17 | file://60-gpsd.rules \ |
20 | file://gpsd.service \ | 18 | file://gpsd.service \ |
21 | " | 19 | " |
22 | SRC_URI[md5sum] = "52d9785eaf1a51298bb8900dbde88f98" | 20 | SRC_URI[md5sum] = "fc5b03aae38b9b5b6880b31924d0ace3" |
23 | SRC_URI[sha256sum] = "7800c478ee9d7ca7a502b0f892828561b1fbf7bc69d9d38c447c82c3628302ac" | 21 | SRC_URI[sha256sum] = "706fc2c1cf3dfbf87c941f543381bccc9c4dc9f8240eec407dcbf2f70b854320" |
24 | 22 | ||
25 | inherit scons update-rc.d python-dir pythonnative systemd | 23 | inherit scons update-rc.d python-dir pythonnative systemd |
26 | 24 | ||