diff options
Diffstat (limited to 'recipes-navigation')
36 files changed, 0 insertions, 3661 deletions
diff --git a/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch deleted file mode 100644 index 2ea3226..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 1e2cea8945bc2183fbe1a012dcd633a352125952 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 - 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 - -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(+) - -diff --git a/SConstruct b/SConstruct -index 6c93311..cde8b3d 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1148,6 +1148,12 @@ else: - basecflags += ' -coverage' - ldflags += ' -coverage' - ldshared += ' -coverage' -+ -+ 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 -+ - # in case CC/CXX was set to the scan-build wrapper, - # ensure that we build the python modules with scan-build, too - if env['CC'] is None or env['CC'].find('scan-build') < 0: -@@ -1408,11 +1414,14 @@ if not env['python']: - python_install = [] - else: - python_lib_dir = env['python_libdir'] -+ 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 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_lib_dir, )) - - python_modules_install = python_env.Install( DESTDIR + python_module_dir, - python_modules) --- -2.1.0 - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch b/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch deleted file mode 100644 index b27c671..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0001-include-sys-ttydefaults.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 543f79222520cc6ab65d20f9fa356dac5c848e3b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 17 Aug 2016 02:16:12 +0000 -Subject: [PATCH] include sys/ttydefaults.h - -This is needed for CTRL definition, as exposed by musl on glibc -this include file gets pulled indirectly. - -/usr/src/debug/gpsd/3.14-r0/gpsd-3.14/gpsmon.c:605: undefined reference to `CTRL' -clang-3.9: error: linker command failed with exit code 1 (use -v to see invocation) -scons: *** [gpsmon] Error 1 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - gpsmon.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gpsmon.c b/gpsmon.c -index bee05b8..daed818 100644 ---- a/gpsmon.c -+++ b/gpsmon.c -@@ -20,6 +20,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/select.h> -+#include <sys/ttydefaults.h> - #include <fcntl.h> - #ifndef S_SPLINT_S - #include <unistd.h> --- -1.8.3.1 - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch b/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch deleted file mode 100644 index 083a662..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0002-SConstruct-remove-rpath.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d090638ff983e509162d5e3b62aa4918de4aa5fa Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 24 Apr 2012 16:24:35 +0200 -Subject: [PATCH 2/4] SConstruct: remove rpath - -* even with correct prefix (without DESTDIR) included it's redundant - WARNING: QA Issue: libgps: - /work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 - contains probably-redundant RPATH /usr/lib -* and with prefix from scons.bbclass it's invalid - WARNING: QA Issue: package libgps contains bad RPATH - /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/image/usr/lib - in file - /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd/gpsd-3.5-r0/packages-split/libgps/usr/lib/libgps.so.20.0 - -Upstream-Status: Inapppropriate [embedded specific] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> -Signed-off-by: Peter A. Bigot <pab@pabigot.com> ---- - SConstruct | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index f0cafa8..ff46713 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -1340,8 +1340,11 @@ if qt_env: - binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib)) - - if env["shared"] and env["chrpath"]: -- env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ -- % (installdir('libdir', False), )) -+ if not env['sysroot']: -+ env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \ -+ % (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.8.5.5 - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch deleted file mode 100644 index 8527f0d..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 29 Apr 2012 00:05:59 +0200 -Subject: [PATCH 4/4] SConstruct: disable html and man docs building because - xmlto-native from OE is broken - -It will try to load dtd and fail: -| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1 -| xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3) -| xmlto: Fix document syntax or use --skip-validation option -| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd -| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -| ^ -| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd -| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate -| mv: cannot stat `gpsctl.1': No such file or directory -| scons: *** [gpsctl.1] Error 1 -| scons: building terminated because of errors. - -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Signed-off-by: Peter A. Bigot <pab@pabigot.com> ---- - SConstruct | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index 0e518e7..c01a71b 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -704,12 +704,12 @@ size_t strlcpy(/*@out@*/char *dst, /*@in@*/const char *src, size_t size); - - manbuilder = mangenerator = htmlbuilder = None - if env['manbuild']: -- if config.CheckXsltproc(): -+ if False and config.CheckXsltproc(): - mangenerator = 'xsltproc' - build = "xsltproc --nonet %s $SOURCE >$TARGET" - htmlbuilder = build % docbook_html_uri - manbuilder = build % docbook_man_uri -- elif WhereIs("xmlto"): -+ elif False and WhereIs("xmlto"): - mangenerator = 'xmlto' - xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` `dirname $TARGET`" - htmlbuilder = xmlto % "html-nochunks" --- -1.8.5.5 - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch b/recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch deleted file mode 100644 index f338126..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0005-suppress-text-in-binary.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u old/gpsctl.c new/gpsctl.c ---- old/gpsctl.c 2017-01-03 15:57:50.517120891 -0600 -+++ new/gpsctl.c 2017-01-03 18:31:21.421101434 -0600 -@@ -175,7 +175,7 @@ - int option, status; - char *device = NULL, *devtype = NULL; - char *speed = NULL, *control = NULL, *rate = NULL; -- bool to_binary = false, to_nmea = false, reset = false; -+ bool to_binary = false, to_nmea = false, reset = false, control_string = false; - bool lowlevel=false, echo=false; - struct gps_data_t gpsdata; - const struct gps_type_t *forcetype = NULL; -@@ -205,6 +205,7 @@ - #ifdef CONTROLSEND_ENABLE - control = optarg; - lowlevel = true; -+ control_string = true; - if ((cooklen = hex_escapes(cooked, control)) <= 0) { - gpsd_log(&context.errout, LOG_ERROR, - "invalid escape string (error %d)\n", (int)cooklen); -@@ -704,7 +705,8 @@ - } - } - -- (void)printf("%s identified as a %s at %u baud.\n", -+ if(!control_string) -+ (void)printf("%s identified as a %s at %u baud.\n", - device, gpsd_id(&session), - session.gpsdata.dev.baudrate); - diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch deleted file mode 100644 index 8e8d814..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0006-itu_r_tf_460_6.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur old/ntpshmwrite.c new/ntpshmwrite.c ---- old/ntpshmwrite.c 2017-01-23 10:00:05.497129473 -0600 -+++ new/ntpshmwrite.c 2017-01-23 09:47:58.881627772 -0600 -@@ -32,11 +32,18 @@ - * NTP expects leap pending for only 1 month prior to insertion - * Per http://bugs.ntp.org/1090 */ - (void)gmtime_r( &(td->real.tv_sec), &tm); -+/* This code contradicts page 3 section 2.1 of ITU-R RV.460-6 that -+ * leap second may occur at the last second of a month, with -+ * preference for December and June, 2nd preference to March and -+ * September. -+ * https://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf -+ */ -+#ifdef NOTITU_R_TF_460_6 - if ( 5 != tm.tm_mon && 11 != tm.tm_mon ) { - /* Not june, not December, no way */ - leap_notify = LEAP_NOWARNING; - } -- -+#endif /* NOTITU_R_TF_460_6 */ - /* we use the shmTime mode 1 protocol - * - * ntpd does this: diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch deleted file mode 100644 index e6b90f0..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0006-sysclockcrash.patch +++ /dev/null @@ -1,48 +0,0 @@ -Before the fix, sample PPS Logs: -gpsd:PROG: KPPS:/dev/pps0 Clear cycle: -1236963952, duration: 1000000 @ (null) -gpsd:PROG: PPS:/dev/pps0 Clear cycle: 0, duration: 1000000 @ (null) - -With this fix, we see logs like this: -gpsd:PROG: KPPS:/dev/pps0 Clear cycle: 1000010, duration: 100003 @ 1577729345.554599378 -gpsd:PROG: PPS:/dev/pps0 Clear cycle: 1000010, duration: 100003 @ 1577729345.554599378 - -When the system clock changes without this fix, and the -debug level is 4 or greater, GPSD crashes on 32 bit ARM. -This fix prevents strlen() in vfprintf() from being given -a garbage pointer. cycle, cycle_kpps, duration and -duration_kpps are defined as long long, so by the C -standard, the format string is %lld. -======================================================================= -diff -Naur old/ppsthread.c new/ppsthread.c ---- old/ppsthread.c 2017-02-01 11:36:31.575212221 -0600 -+++ new/ppsthread.c 2017-02-01 11:44:48.269536679 -0600 -@@ -770,10 +770,9 @@ - edge_str = edge ? "Assert" : "Clear"; - cycle = cycle_tio; - duration = duration_tio; -- - timespec_str( &clock_ts, ts_str1, sizeof(ts_str1) ); - thread_context->log_hook(thread_context, THREAD_PROG, -- "TPPS:%s %.10s cycle: %d, duration: %d @ %s\n", -+ "TPPS:%s %.10s cycle: %lld, duration: %lld @ %s\n", - thread_context->devicename, edge_str, cycle, duration, - ts_str1); - -@@ -840,7 +839,7 @@ - - timespec_str( &clock_ts_kpps, ts_str1, sizeof(ts_str1) ); - thread_context->log_hook(thread_context, THREAD_PROG, -- "KPPS:%s %.10s cycle: %7d, duration: %7d @ %s\n", -+ "KPPS:%s %.10s cycle: %7lld, duration: %7lld @ %s\n", - thread_context->devicename, - edge_str, - cycle_kpps, duration_kpps, ts_str1); -@@ -898,7 +897,7 @@ - state_last = state; - timespec_str( &clock_ts, ts_str1, sizeof(ts_str1) ); - thread_context->log_hook(thread_context, THREAD_PROG, -- "PPS:%s %.10s cycle: %7d, duration: %7d @ %s\n", -+ "PPS:%s %.10s cycle: %7lld, duration: %7lld @ %s\n", - thread_context->devicename, - edge_str, - cycle, duration, ts_str1); diff --git a/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch b/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch deleted file mode 100644 index e715847..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0006-ubxtimelps.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff -Naur old/driver_ubx.c new/driver_ubx.c ---- old/driver_ubx.c 2017-01-19 14:12:25.099231346 -0600 -+++ new/driver_ubx.c 2017-01-19 15:13:58.552152991 -0600 -@@ -57,6 +57,29 @@ - #define UBX_CFG_LEN 20 - #define outProtoMask 14 - -+#ifdef UBLOXTIMELS_ENABLE -+/* UBX-NAV-TIMELS support */ -+static char *srcOfCurrLs[] = { -+ "firmware", -+ "GPS GLONASS difference", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "Aided data", -+ "Configured" -+}; -+static char *srcOfLsChange[] = { -+ "No Source", -+ "Undefined", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "GLONOSS", -+}; -+#endif /* UBLOXTIMELS_ENABLE */ -+ - static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf, - size_t len); - static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session, -@@ -237,6 +260,89 @@ - return mask; - } - -+#ifdef UBLOXTIMELS_ENABLE -+/** -+ * Navigation time to leap second -+ * -+ * Sets leap_notify if leap second is < 23 hours away. -+ */ -+static void -+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf, -+ size_t data_len) -+{ -+ int version; -+ unsigned int flags; -+ int valid_curr_ls; -+ int valid_time_to_ls_event; -+ -+ if (data_len != 24) { -+ gpsd_log(&session->context->errout, LOG_WARN, -+ "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n", -+ data_len); -+ return; -+ } -+ version = getsb(buf,4); -+ /* Only version 0 is defined so far. */ -+ flags = (unsigned int)getub(buf, 23); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version); -+ valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS; -+ valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT; -+ if(valid_curr_ls) { -+ unsigned int src_of_curr_ls = getub(buf,8); -+ int curr_ls = getsb(buf,9); -+ char *src = "Unknown"; -+ -+ if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0]))) -+ src = srcOfCurrLs[src_of_curr_ls]; -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n", -+ src_of_curr_ls,src,curr_ls); -+ session->context->leap_seconds = curr_ls; -+ session->context->valid |= LEAP_SECOND_VALID; -+ } /* Valid current leap second */ -+ if(valid_time_to_ls_event) { -+ char *src="Unknown"; -+ unsigned int src_of_ls_change; -+ unsigned short dateOfLSGpsWn, dateOfLSGpsDn; -+ int lsChange = getsb(buf,11); -+ int timeToLsEvent = getles32(buf,12); -+ src_of_ls_change = getub(buf,10); -+ if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0]))) -+ src = srcOfLsChange[src_of_ls_change]; -+ dateOfLSGpsWn = getles16(buf,16); -+ dateOfLSGpsDn = getles16(buf,18); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n", -+ dateOfLSGpsWn,dateOfLSGpsDn); -+ if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) { -+ if(lsChange == 0) -+ session->context->leap_notify = LEAP_NOWARNING; -+ else if (lsChange == 1) -+ session->context->leap_notify = LEAP_ADDSECOND; -+ else if (lsChange == -1) -+ session->context->leap_notify = LEAP_DELSECOND; -+ } else -+ session->context->leap_notify = LEAP_NOWARNING; -+ -+ if (session->context->leap_notify == LEAP_ADDSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Add leap second today\n"); -+ else if (session->context->leap_notify == LEAP_DELSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Remove leap second today\n"); -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: leaving: leap_notify=%d\n", -+ session->context->leap_notify); -+ } -+} -+#endif /* UBLOXTIMELS_ENABLE */ - /** - * Geodetic position solution message - */ -@@ -523,13 +629,22 @@ - case UBX_NAV_EKFSTATUS: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n"); - break; -- -+ case UBX_NAV_TIMELS: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n"); -+#ifdef UBLOXTIMELS_ENABLE -+ ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len); -+#endif // UBLOXTIMELS_ENABLE -+ break; - case UBX_RXM_RAW: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n"); - break; - case UBX_RXM_SFRB: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n"); - mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]); - break; -+ case UBX_RXM_SFRBX: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n"); -+ break; - case UBX_RXM_SVSI: - gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n"); - break; -@@ -955,6 +1070,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x01; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+#endif /* UBLOXTIMELS_ENABLE */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x0a; /* rate */ -diff -Naur old/driver_ubx.h new/driver_ubx.h ---- old/driver_ubx.h 2017-01-19 14:12:25.099231346 -0600 -+++ new/driver_ubx.h 2017-01-19 14:01:48.177653001 -0600 -@@ -35,6 +35,7 @@ - UBX_NAV_TIMEGPS = UBX_MSGID(UBX_CLASS_NAV, 0x20), - UBX_NAV_TIMEUTC = UBX_MSGID(UBX_CLASS_NAV, 0x21), - UBX_NAV_CLOCK = UBX_MSGID(UBX_CLASS_NAV, 0x22), -+ UBX_NAV_TIMELS = UBX_MSGID(UBX_CLASS_NAV, 0x26), - UBX_NAV_SVINFO = UBX_MSGID(UBX_CLASS_NAV, 0x30), - UBX_NAV_DGPS = UBX_MSGID(UBX_CLASS_NAV, 0x31), - UBX_NAV_SBAS = UBX_MSGID(UBX_CLASS_NAV, 0x32), -@@ -42,6 +43,7 @@ - - UBX_RXM_RAW = UBX_MSGID(UBX_CLASS_RXM, 0x10), - UBX_RXM_SFRB = UBX_MSGID(UBX_CLASS_RXM, 0x11), -+ UBX_RXM_SFRBX = UBX_MSGID(UBX_CLASS_RXM, 0x13), - UBX_RXM_SVSI = UBX_MSGID(UBX_CLASS_RXM, 0x20), - UBX_RXM_ALM = UBX_MSGID(UBX_CLASS_RXM, 0x30), - UBX_RXM_EPH = UBX_MSGID(UBX_CLASS_RXM, 0x31), -@@ -102,6 +104,9 @@ - #define UBX_SOL_VALID_WEEK 0x04 - #define UBX_SOL_VALID_TIME 0x08 - -+#define UBX_TIMELS_VALID_CURR_LS 0x01 -+#define UBX_TIMELS_VALID_TIME_LS_EVT 0x01 -+ - /* from UBX_NAV_SVINFO */ - #define UBX_SAT_USED 0x01 - #define UBX_SAT_DGPS 0x02 -diff -Naur old/SConstruct new/SConstruct ---- old/SConstruct 2017-01-19 14:51:35.638466569 -0600 -+++ new/SConstruct 2017-01-19 15:20:02.488159765 -0600 -@@ -113,6 +113,7 @@ - ("tripmate", True, "DeLorme TripMate support"), - ("tsip", True, "Trimble TSIP support"), - ("ublox", True, "u-blox Protocol support"), -+ ("ubloxtimels", False, "u-blox UBX-NAV-TIMELS support (leap second)"), - ("fury", True, "Jackson Labs Fury and Firefly support"), - ("nmea2000", True, "NMEA2000/CAN support"), - # Non-GPS protocols diff --git a/recipes-navigation/gpsd/gpsd-3.16/0008-major_gnu.patch b/recipes-navigation/gpsd/gpsd-3.16/0008-major_gnu.patch deleted file mode 100644 index 8582712..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/0008-major_gnu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naru orig/serial.c new/serial.c ---- orig/serial.c 2019-07-26 18:01:44.178086824 -0500 -+++ new/serial.c 2019-07-26 18:02:49.742084883 -0500 -@@ -64,7 +64,7 @@ - * stable and architecture-independent. It is *not* a good model - * for other Unixes where either or both assumptions may break. - */ -- int devmajor = major(sb.st_rdev); -+ int devmajor = gnu_dev_major(sb.st_rdev); - /* 207 are Freescale i.MX UARTs (ttymxc*) */ - if (devmajor == 4 || devmajor == 204 || devmajor == 207) - devtype = source_rs232; diff --git a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch b/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch deleted file mode 100644 index 658b757..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -Naur old/driver_ubx.c new/driver_ubx.c ---- old/driver_ubx.c 2017-08-01 10:56:05.757282801 -0500 -+++ new/driver_ubx.c 2017-08-01 10:53:49.785286827 -0500 -@@ -57,6 +57,29 @@ - #define UBX_CFG_LEN 20 - #define outProtoMask 14 - -+#ifdef UBLOXTIMELS_ENABLE -+/* UBX-NAV-TIMELS support */ -+static char *srcOfCurrLs[] = { -+ "firmware", -+ "GPS GLONASS difference", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "Aided data", -+ "Configured" -+}; -+static char *srcOfLsChange[] = { -+ "No Source", -+ "Undefined", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "GLONOSS", -+}; -+#endif /* UBLOXTIMELS_ENABLE */ -+ - static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf, - size_t len); - static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session, -@@ -237,6 +260,96 @@ - return mask; - } - -+#ifdef UBLOXTIMELS_ENABLE -+/** -+ * Navigation time to leap second -+ * -+ * Sets leap_notify if leap second is < 23 hours away. -+ */ -+static void -+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf, -+ size_t data_len) -+{ -+ int version; -+ unsigned int flags; -+ int valid_curr_ls; -+ int valid_time_to_ls_event; -+ -+ if (data_len != 24) { -+ gpsd_log(&session->context->errout, LOG_WARN, -+ "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n", -+ data_len); -+ return; -+ } -+ version = getsb(buf,4); -+ /* Only version 0 is defined so far. */ -+ flags = (unsigned int)getub(buf, 23); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version); -+ valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS; -+ valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT; -+ if(valid_curr_ls) { -+ unsigned int src_of_curr_ls = getub(buf,8); -+ int curr_ls = getsb(buf,9); -+ char *src = "Unknown"; -+ -+ if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0]))) -+ src = srcOfCurrLs[src_of_curr_ls]; -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n", -+ src_of_curr_ls,src,curr_ls); -+ session->context->leap_seconds = curr_ls; -+ session->context->valid |= LEAP_SECOND_VALID; -+ } /* Valid current leap second */ -+ if(valid_time_to_ls_event) { -+ char *src="Unknown"; -+ unsigned int src_of_ls_change; -+ unsigned short dateOfLSGpsWn, dateOfLSGpsDn; -+ int lsChange = getsb(buf,11); -+ int timeToLsEvent = getles32(buf,12); -+int secondsperday=24*60*60; -+lsChange = 1; /* JAK Forward one second */ -+ src_of_ls_change = getub(buf,10); -+ if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0]))) -+ src = srcOfLsChange[src_of_ls_change]; -+ dateOfLSGpsWn = getles16(buf,16); -+ dateOfLSGpsDn = getles16(buf,18); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); -+timeToLsEvent += 212*secondsperday; /* JAK Jul 31 Leap second for test */ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS2: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); /* JAK */ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n", -+ dateOfLSGpsWn,dateOfLSGpsDn); -+ if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) { -+ if(lsChange == 0) -+ session->context->leap_notify = LEAP_NOWARNING; -+ else if (lsChange == 1) -+ session->context->leap_notify = LEAP_ADDSECOND; -+ else if (lsChange == -1) -+ session->context->leap_notify = LEAP_DELSECOND; -+ } else -+ session->context->leap_notify = LEAP_NOWARNING; -+ -+ if (session->context->leap_notify == LEAP_ADDSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Add leap second today\n"); -+ else if (session->context->leap_notify == LEAP_DELSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Remove leap second today\n"); -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: leaving: leap_notify=%d\n", -+ session->context->leap_notify); -+ } -+} -+#endif /* UBLOXTIMELS_ENABLE */ - /** - * Geodetic position solution message - */ -@@ -523,13 +636,22 @@ - case UBX_NAV_EKFSTATUS: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n"); - break; -- -+ case UBX_NAV_TIMELS: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n"); -+#ifdef UBLOXTIMELS_ENABLE -+ ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len); -+#endif // UBLOXTIMELS_ENABLE -+ break; - case UBX_RXM_RAW: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n"); - break; - case UBX_RXM_SFRB: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n"); - mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]); - break; -+ case UBX_RXM_SFRBX: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n"); -+ break; - case UBX_RXM_SVSI: - gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n"); - break; -@@ -955,6 +1077,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x01; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+#endif /* UBLOXTIMELS_ENABLE */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x0a; /* rate */ diff --git a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt b/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt deleted file mode 100644 index d9bf4b1..0000000 --- a/recipes-navigation/gpsd/gpsd-3.16/leap2017Aug31.readme.txt +++ /dev/null @@ -1,169 +0,0 @@ -The purpose of this test is to verify leap second operation with ntp. This is done -by artificially setting the leap second offset in gpsd. ntp is not modified. -Software levels: - gpsd - 3.16-m2.9 + the Aug 31 test patch - ntp - 4.2.8p9-r0.mlinux3.0. Release candidate for mLinux 4.0 - -ntpd leap second test gpsd artificially causes a leap second on Aug 31, 2017 23:59:59 UTC. - -The patch for this test is leap2017Aug31.patch. This patch replaces 0006-ubxtimelps.patch. - - -Kernel Log: - -2017-07-31T18:50:02.012018-05:00 leaptest CROND[5205]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T18:55:01.119140-05:00 leaptest CROND[5223]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T18:59:59.016393-05:00 leaptest kernel: Clock: inserting leap second 23:59:60 UTC -2017-07-31T19:00:01.215873-05:00 leaptest CROND[5240]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T19:00:07.381218-05:00 leaptest ntpd[501]: kernel reports leap second has occurred -2017-07-31T19:00:07.381528-05:00 leaptest ntpd[501]: kernel reports leap second has occurred -2017-07-31T19:05:01.313170-05:00 leaptest CROND[5258]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) - - -Time log from user space. 18:59:59 repeats twice 19:00:00 appears only once.: - -2017-07-31T18:59:57.855895-05:00 leaptest CTST: epoch: 1501545597.855 boot: 442607.123 -2017-07-31T18:59:58.106318-05:00 leaptest CTST: epoch: 1501545598.106 boot: 442607.373 -2017-07-31T18:59:58.356758-05:00 leaptest CTST: epoch: 1501545598.356 boot: 442607.624 -2017-07-31T18:59:58.607171-05:00 leaptest CTST: epoch: 1501545598.606 boot: 442607.874 -2017-07-31T18:59:58.857621-05:00 leaptest CTST: epoch: 1501545598.857 boot: 442608.124 -2017-07-31T18:59:59.108072-05:00 leaptest CTST: epoch: 1501545599.107 boot: 442608.375 -2017-07-31T18:59:59.358506-05:00 leaptest CTST: epoch: 1501545599.358 boot: 442608.625 -2017-07-31T18:59:59.608952-05:00 leaptest CTST: epoch: 1501545599.608 boot: 442608.876 -2017-07-31T18:59:59.859364-05:00 leaptest CTST: epoch: 1501545599.859 boot: 442609.126 -2017-07-31T18:59:59.109780-05:00 leaptest CTST: epoch: 1501545599.109 boot: 442609.377 -2017-07-31T18:59:59.360195-05:00 leaptest CTST: epoch: 1501545599.359 boot: 442609.627 -2017-07-31T18:59:59.610608-05:00 leaptest CTST: epoch: 1501545599.610 boot: 442609.877 -2017-07-31T18:59:59.861023-05:00 leaptest CTST: epoch: 1501545599.860 boot: 442610.128 -2017-07-31T19:00:00.111461-05:00 leaptest CTST: epoch: 1501545600.111 boot: 442610.378 -2017-07-31T19:00:00.361916-05:00 leaptest CTST: epoch: 1501545600.361 boot: 442610.629 -2017-07-31T19:00:00.612329-05:00 leaptest CTST: epoch: 1501545600.612 boot: 442610.879 -2017-07-31T19:00:00.862825-05:00 leaptest CTST: epoch: 1501545600.862 boot: 442611.130 -2017-07-31T19:00:01.113251-05:00 leaptest CTST: epoch: 1501545601.112 boot: 442611.380 -2017-07-31T19:00:01.363695-05:00 leaptest CTST: epoch: 1501545601.363 boot: 442611.630 -2017-07-31T19:00:01.614114-05:00 leaptest CTST: epoch: 1501545601.613 boot: 442611.881 -2017-07-31T19:00:01.864524-05:00 leaptest CTST: epoch: 1501545601.864 boot: 442612.131 - - - -Leap second flag set artifically by gpsd, and noticed by ntp (leap=01 for SHM(0) and SHM(2) and leap_armed): -2017-07-31T18:59:22.952281-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:22.962756-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T18:59:22.964152-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.130829-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T18:59:23.131062-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T18:59:23.131258-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T18:59:23.131451-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T18:59:23.131647-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T18:59:23.131840-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T18:59:23.132031-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T18:59:23.132220-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T18:59:23.138000-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.138206-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T18:59:23.138404-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.434429-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T18:59:23.434666-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T18:59:23.434863-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 20 64 377 0.000 6.410 1.265 -2017-07-31T18:59:23.435055-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 19 64 377 0.000 0.062 0.008 -2017-07-31T18:59:23.435249-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:00:22.459905-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.460141-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum - - - -2017-07-31T19:00:22.460343-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.618627-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 16 64 377 0.000 7.369 0.661 -2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 15 64 377 0.000 0.059 0.008 -2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 13 64 377 0.000 1007.48 1000.36 -2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 12 64 377 0.000 1000.05 999.994 -2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt - - -Offset goes to one second, because there was no leap second: -2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 16 64 377 0.000 7.369 0.661 -2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 15 64 377 0.000 0.059 0.008 -2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 13 64 377 0.000 1007.48 1000.36 -2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 12 64 377 0.000 1000.05 999.994 -2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt - - -Leap second flag is clear, leap_armed is removed so no leap second on Aug 1, 2017: -2017-07-31T19:38:42.630432-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:38:42.630636-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:38:42.791369-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:38:42.791605-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:38:42.791803-05:00 leaptest ntpstatus.sh: 1 18654 945a yes yes none candidate sys_peer 5 -2017-07-31T19:38:42.791994-05:00 leaptest ntpstatus.sh: 2 18655 966a yes yes none sys.peer sys_peer 6 -2017-07-31T19:38:42.792189-05:00 leaptest ntpstatus.sh: 3 18656 8033 yes no none reject unreachable 3 -2017-07-31T19:38:42.792379-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=00, stratum=0 -2017-07-31T19:38:42.802875-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=00, stratum=0 -2017-07-31T19:38:42.804254-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=00, stratum=14 - - diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch deleted file mode 100644 index a1e71cf..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0001-SConstruct-prefix-includepy-with-sysroot-and-drop-sy.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 1e2cea8945bc2183fbe1a012dcd633a352125952 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 - 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 - -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(+) - -diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct ---- gpsd-3.18.1.orig/SConstruct 2018-10-26 15:31:33.890410700 -0500 -+++ gpsd-3.18.1/SConstruct 2018-10-26 17:25:45.202207869 -0500 -@@ -980,7 +980,7 @@ - - # Set up configuration for target Python - --PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib()' -+PYTHON_LIBDIR_CALL = 'sysconfig.get_python_lib(plat_specific=1)' - - PYTHON_CONFIG_NAMES = ['CC', 'CXX', 'OPT', 'BASECFLAGS', - 'CCSHARED', 'LDSHARED', 'SO', 'INCLUDEPY', 'LDFLAGS'] -@@ -1034,8 +1034,8 @@ - # follow FHS, put in /usr/local/libXX, not /usr/libXX - # may be lib, lib32 or lib64 - python_libdir = polystr(python_libdir) -- python_libdir = python_libdir.replace("/usr/lib", -- "/usr/local/lib") -+# python_libdir = python_libdir.replace("/usr/lib", -+# "/usr/local/lib") - - py_config_text = config.GetPythonValue('config vars', - PYTHON_SYSCONFIG_IMPORT, -@@ -1506,7 +1506,7 @@ - LINK=ldshared, - SHLIBPREFIX="", - SHLIBSUFFIX=python_config['SO'], -- CPPPATH=[python_config['INCLUDEPY']], -+ CPPPATH=[os.path.normpath("%s/%s/%s/%s" % (env['sysroot'], env['prefix'], env['includedir'], python_config['INCLUDEPY']))] if env['sysroot'] else [python_config['INCLUDEPY']], - CPPFLAGS=python_config['OPT'], - CFLAGS=python_config['BASECFLAGS'], - CXXFLAGS=python_config['BASECFLAGS']) -@@ -1808,12 +1808,15 @@ - env.AddPostAction(binaryinstall, '$STRIP $TARGET') - - if env['python']: -+ python_libdir = python_libdir.replace(env['sysroot'], '') - python_module_dir = str(python_libdir) + 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'))): - 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) diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch deleted file mode 100644 index e91e4e9..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0001-include-sys-ttydefaults.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f221fa959c80b43c65426500a6836a1b5cf6fe0c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 17 Aug 2016 02:16:12 +0000 -Subject: [PATCH] include sys/ttydefaults.h - -This is needed for CTRL definition, as exposed by musl on glibc -this include file gets pulled indirectly. - -/usr/src/debug/gpsd/3.14-r0/gpsd-3.14/gpsmon.c:605: undefined reference to `CTRL' -clang-3.9: error: linker command failed with exit code 1 (use -v to see invocation) -scons: *** [gpsmon] Error 1 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Foreward port to gpsd 3.16 -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - gpsmon.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gpsmon.c b/gpsmon.c -index 89c43ee2..5cc0dabd 100644 ---- a/gpsmon.c -+++ b/gpsmon.c -@@ -24,6 +24,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/select.h> -+#include <sys/ttydefaults.h> - #include <fcntl.h> - #include <unistd.h> - --- -2.12.0 - diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch deleted file mode 100644 index ad690ce..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0004-SConstruct-disable-html-and-man-docs-building-becaus.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 697e2e9ff97487266d817cdd41bacc83f681e3d7 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 29 Apr 2012 00:05:59 +0200 -Subject: [PATCH 4/4] SConstruct: disable html and man docs building because - xmlto-native from OE is broken - -It will try to load dtd and fail: -| xmlto man gpsctl.xml; mv `basename gpsctl.1` gpsctl.1 -| xmlto: /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate (status 3) -| xmlto: Fix document syntax or use --skip-validation option -| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd -| /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml:8: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"> -| ^ -| I/O error : Attempt to load network entity http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd -| warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" -| Document /var/lib/jenkins/jobs/shr-core-branches/workspace/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gpsd-3.4-r2/gpsd-3.4/gpsctl.xml does not validate -| mv: cannot stat `gpsctl.1': No such file or directory -| scons: *** [gpsctl.1] Error 1 -| scons: building terminated because of errors. - -Upstream-Status: Inappropriate [disable feature] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Signed-off-by: Peter A. Bigot <pab@pabigot.com> ---- - SConstruct | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct ---- gpsd-3.18.1.orig/SConstruct 2018-10-26 18:17:17.102116334 -0500 -+++ gpsd-3.18.1/SConstruct 2018-10-26 18:18:40.102113877 -0500 -@@ -935,11 +935,11 @@ - - manbuilder = htmlbuilder = None - if env['manbuild']: -- if config.CheckXsltproc(): -+ if False and config.CheckXsltproc(): - build = "xsltproc --nonet %s $SOURCE >$TARGET" - htmlbuilder = build % docbook_html_uri - manbuilder = build % docbook_man_uri -- elif WhereIs("xmlto"): -+ elif False and WhereIs("xmlto"): - xmlto = "xmlto %s $SOURCE || mv `basename $TARGET` " \ - "`dirname $TARGET`" - htmlbuilder = xmlto % "html-nochunks" diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch deleted file mode 100644 index 8e8d814..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0006-itu_r_tf_460_6.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur old/ntpshmwrite.c new/ntpshmwrite.c ---- old/ntpshmwrite.c 2017-01-23 10:00:05.497129473 -0600 -+++ new/ntpshmwrite.c 2017-01-23 09:47:58.881627772 -0600 -@@ -32,11 +32,18 @@ - * NTP expects leap pending for only 1 month prior to insertion - * Per http://bugs.ntp.org/1090 */ - (void)gmtime_r( &(td->real.tv_sec), &tm); -+/* This code contradicts page 3 section 2.1 of ITU-R RV.460-6 that -+ * leap second may occur at the last second of a month, with -+ * preference for December and June, 2nd preference to March and -+ * September. -+ * https://www.itu.int/dms_pubrec/itu-r/rec/tf/R-REC-TF.460-6-200202-I!!PDF-E.pdf -+ */ -+#ifdef NOTITU_R_TF_460_6 - if ( 5 != tm.tm_mon && 11 != tm.tm_mon ) { - /* Not june, not December, no way */ - leap_notify = LEAP_NOWARNING; - } -- -+#endif /* NOTITU_R_TF_460_6 */ - /* we use the shmTime mode 1 protocol - * - * ntpd does this: diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch b/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch deleted file mode 100644 index 030001c..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/0006-ubxtimelps.patch +++ /dev/null @@ -1,192 +0,0 @@ -diff -Naru gpsd-3.18.1.orig/driver_ubx.c gpsd-3.18.1/driver_ubx.c ---- gpsd-3.18.1.orig/driver_ubx.c 2018-10-26 16:01:08.010358178 -0500 -+++ gpsd-3.18.1/driver_ubx.c 2018-10-29 17:30:18.354526227 -0500 -@@ -57,6 +57,29 @@ - #define UBX_CFG_LEN 20 - #define outProtoMask 14 - -+#ifdef UBLOXTIMELS_ENABLE -+/* UBX-NAV-TIMELS support */ -+static char *srcOfCurrLs[] = { -+ "firmware", -+ "GPS GLONASS difference", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "Aided data", -+ "Configured" -+}; -+static char *srcOfLsChange[] = { -+ "No Source", -+ "Undefined", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "GLONOSS", -+}; -+#endif /* UBLOXTIMELS_ENABLE */ -+ - static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf, - size_t len); - static gps_mask_t ubx_msg_nav_eoe(struct gps_device_t *session, -@@ -397,6 +420,90 @@ - return mask; - } - -+#ifdef UBLOXTIMELS_ENABLE -+/** -+ * Navigation time to leap second -+ * -+ * Sets leap_notify if leap second is < 23 hours away. -+ */ -+static void -+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf, -+ size_t data_len) -+{ -+ int version; -+ unsigned int flags; -+ int valid_curr_ls; -+ int valid_time_to_ls_event; -+ -+ if (data_len != 24) { -+ gpsd_log(&session->context->errout, LOG_WARN, -+ "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n", -+ data_len); -+ return; -+ } -+ version = getsb(buf,4); -+ /* Only version 0 is defined so far. */ -+ flags = (unsigned int)getub(buf, 23); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version); -+ valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS; -+ valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT; -+ if(valid_curr_ls) { -+ unsigned int src_of_curr_ls = getub(buf,8); -+ int curr_ls = getsb(buf,9); -+ char *src = "Unknown"; -+ -+ if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0]))) -+ src = srcOfCurrLs[src_of_curr_ls]; -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n", -+ src_of_curr_ls,src,curr_ls); -+ session->context->leap_seconds = curr_ls; -+ session->context->valid |= LEAP_SECOND_VALID; -+ } /* Valid current leap second */ -+ if(valid_time_to_ls_event) { -+ char *src="Unknown"; -+ unsigned int src_of_ls_change; -+ unsigned short dateOfLSGpsWn, dateOfLSGpsDn; -+ int lsChange = getsb(buf,11); -+ int timeToLsEvent = getles32(buf,12); -+ src_of_ls_change = getub(buf,10); -+ if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0]))) -+ src = srcOfLsChange[src_of_ls_change]; -+ dateOfLSGpsWn = getles16(buf,16); -+ dateOfLSGpsDn = getles16(buf,18); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n", -+ dateOfLSGpsWn,dateOfLSGpsDn); -+ if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) { -+ if(lsChange == 0) -+ session->context->leap_notify = LEAP_NOWARNING; -+ else if (lsChange == 1) -+ session->context->leap_notify = LEAP_ADDSECOND; -+ else if (lsChange == -1) -+ session->context->leap_notify = LEAP_DELSECOND; -+ } else -+ session->context->leap_notify = LEAP_NOWARNING; -+ -+ if (session->context->leap_notify == LEAP_ADDSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Add leap second today\n"); -+ else if (session->context->leap_notify == LEAP_DELSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Remove leap second today\n"); -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: leaving: leap_notify=%d\n", -+ session->context->leap_notify); -+ } -+} -+#endif /* UBLOXTIMELS_ENABLE */ -+ - /** - * Geodetic position solution message - */ -@@ -1129,6 +1236,9 @@ - break; - case UBX_NAV_TIMELS: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n"); -+#ifdef UBLOXTIMELS_ENABLE -+ ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len); -+#endif // UBLOXTIMELS_ENABLE - break; - case UBX_NAV_TIMEUTC: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMEUTC\n"); -@@ -1172,6 +1282,7 @@ - gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RTCM\n"); - break; - case UBX_RXM_SFRB: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n"); - mask = ubx_rxm_sfrb(session, &buf[UBX_PREFIX_LEN]); - break; - case UBX_RXM_SFRBX: -@@ -1474,6 +1585,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x00; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+#endif /* UBLOXTIMELS_ENABLE */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x00; /* rate */ -@@ -1558,6 +1675,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x01; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#endif /* UBLOXTIMELS_ENABLE */ - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x0a; /* rate */ -diff -Naru gpsd-3.18.1.orig/driver_ubx.h gpsd-3.18.1/driver_ubx.h ---- gpsd-3.18.1.orig/driver_ubx.h 2018-10-26 16:01:08.010358178 -0500 -+++ gpsd-3.18.1/driver_ubx.h 2018-10-26 16:26:09.114313738 -0500 -@@ -210,6 +210,9 @@ - #define UBX_SOL_VALID_WEEK 0x04 - #define UBX_SOL_VALID_TIME 0x08 - -+#define UBX_TIMELS_VALID_CURR_LS 0x01 -+#define UBX_TIMELS_VALID_TIME_LS_EVT 0x01 -+ - #define UBX_TIMEGPS_VALID_TIME 0x01 - #define UBX_TIMEGPS_VALID_WEEK 0x02 - #define UBX_TIMEGPS_VALID_LEAP_SECOND 0x04 -diff -Naru gpsd-3.18.1.orig/SConstruct gpsd-3.18.1/SConstruct ---- gpsd-3.18.1.orig/SConstruct 2018-10-26 15:53:30.174371732 -0500 -+++ gpsd-3.18.1/SConstruct 2018-10-26 15:55:33.726368074 -0500 -@@ -178,6 +178,7 @@ - ("tripmate", True, "DeLorme TripMate support"), - ("tsip", True, "Trimble TSIP support"), - ("ublox", True, "u-blox Protocol support"), -+ ("ubloxtimels", False, "u-blox UBX-NAV-TIMELS support (leap second)"), - # Non-GPS protocols - ("aivdm", True, "AIVDM support"), - ("gpsclock", True, "GPSClock support"), diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch b/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch deleted file mode 100644 index 658b757..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -Naur old/driver_ubx.c new/driver_ubx.c ---- old/driver_ubx.c 2017-08-01 10:56:05.757282801 -0500 -+++ new/driver_ubx.c 2017-08-01 10:53:49.785286827 -0500 -@@ -57,6 +57,29 @@ - #define UBX_CFG_LEN 20 - #define outProtoMask 14 - -+#ifdef UBLOXTIMELS_ENABLE -+/* UBX-NAV-TIMELS support */ -+static char *srcOfCurrLs[] = { -+ "firmware", -+ "GPS GLONASS difference", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "Aided data", -+ "Configured" -+}; -+static char *srcOfLsChange[] = { -+ "No Source", -+ "Undefined", -+ "GPS", -+ "SBAS", -+ "BeiDou", -+ "Galileo", -+ "GLONOSS", -+}; -+#endif /* UBLOXTIMELS_ENABLE */ -+ - static gps_mask_t ubx_parse(struct gps_device_t *session, unsigned char *buf, - size_t len); - static gps_mask_t ubx_msg_nav_dop(struct gps_device_t *session, -@@ -237,6 +260,96 @@ - return mask; - } - -+#ifdef UBLOXTIMELS_ENABLE -+/** -+ * Navigation time to leap second -+ * -+ * Sets leap_notify if leap second is < 23 hours away. -+ */ -+static void -+ubx_msg_nav_timels(struct gps_device_t *session, unsigned char *buf, -+ size_t data_len) -+{ -+ int version; -+ unsigned int flags; -+ int valid_curr_ls; -+ int valid_time_to_ls_event; -+ -+ if (data_len != 24) { -+ gpsd_log(&session->context->errout, LOG_WARN, -+ "UBX-NAV-TIMELS: unexpected length %d, expecting 24\n", -+ data_len); -+ return; -+ } -+ version = getsb(buf,4); -+ /* Only version 0 is defined so far. */ -+ flags = (unsigned int)getub(buf, 23); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: flags 0x%x message version %d\n",flags, version); -+ valid_curr_ls = flags & UBX_TIMELS_VALID_CURR_LS; -+ valid_time_to_ls_event = flags & UBX_TIMELS_VALID_TIME_LS_EVT; -+ if(valid_curr_ls) { -+ unsigned int src_of_curr_ls = getub(buf,8); -+ int curr_ls = getsb(buf,9); -+ char *src = "Unknown"; -+ -+ if(src_of_curr_ls < (sizeof srcOfCurrLs/(sizeof srcOfCurrLs[0]))) -+ src = srcOfCurrLs[src_of_curr_ls]; -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX-NAV-TIMELS: source_of_current_leapsecond=%u:%s curr_ls=%d\n", -+ src_of_curr_ls,src,curr_ls); -+ session->context->leap_seconds = curr_ls; -+ session->context->valid |= LEAP_SECOND_VALID; -+ } /* Valid current leap second */ -+ if(valid_time_to_ls_event) { -+ char *src="Unknown"; -+ unsigned int src_of_ls_change; -+ unsigned short dateOfLSGpsWn, dateOfLSGpsDn; -+ int lsChange = getsb(buf,11); -+ int timeToLsEvent = getles32(buf,12); -+int secondsperday=24*60*60; -+lsChange = 1; /* JAK Forward one second */ -+ src_of_ls_change = getub(buf,10); -+ if(src_of_ls_change < (sizeof srcOfLsChange/(sizeof srcOfLsChange[0]))) -+ src = srcOfLsChange[src_of_ls_change]; -+ dateOfLSGpsWn = getles16(buf,16); -+ dateOfLSGpsDn = getles16(buf,18); -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); -+timeToLsEvent += 212*secondsperday; /* JAK Jul 31 Leap second for test */ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS2: source_of_leapsecond_change=%u:%s " -+ "leapSecondChage=%d timeToLsEvent=%d\n", -+ src_of_ls_change,src,lsChange,timeToLsEvent); /* JAK */ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: dateOfLSGpsWn=%d dateOfLSGpsDn=%d\n", -+ dateOfLSGpsWn,dateOfLSGpsDn); -+ if(timeToLsEvent < 60*60*23 && timeToLsEvent > 0) { -+ if(lsChange == 0) -+ session->context->leap_notify = LEAP_NOWARNING; -+ else if (lsChange == 1) -+ session->context->leap_notify = LEAP_ADDSECOND; -+ else if (lsChange == -1) -+ session->context->leap_notify = LEAP_DELSECOND; -+ } else -+ session->context->leap_notify = LEAP_NOWARNING; -+ -+ if (session->context->leap_notify == LEAP_ADDSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Add leap second today\n"); -+ else if (session->context->leap_notify == LEAP_DELSECOND) -+ gpsd_log(&session->context->errout,LOG_INF, -+ "UBX_NAV_TIMELS: Remove leap second today\n"); -+ -+ gpsd_log(&session->context->errout, LOG_DATA, -+ "UBX_NAV_TIMELS: leaving: leap_notify=%d\n", -+ session->context->leap_notify); -+ } -+} -+#endif /* UBLOXTIMELS_ENABLE */ - /** - * Geodetic position solution message - */ -@@ -523,13 +636,22 @@ - case UBX_NAV_EKFSTATUS: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_EKFSTATUS\n"); - break; -- -+ case UBX_NAV_TIMELS: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_NAV_TIMELS\n"); -+#ifdef UBLOXTIMELS_ENABLE -+ ubx_msg_nav_timels(session, &buf[UBX_PREFIX_LEN],data_len); -+#endif // UBLOXTIMELS_ENABLE -+ break; - case UBX_RXM_RAW: - gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_RAW\n"); - break; - case UBX_RXM_SFRB: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRB\n"); - mask = ubx_msg_sfrb(session, &buf[UBX_PREFIX_LEN]); - break; -+ case UBX_RXM_SFRBX: -+ gpsd_log(&session->context->errout, LOG_DATA, "UBX_RXM_SFRBX\n"); -+ break; - case UBX_RXM_SVSI: - gpsd_log(&session->context->errout, LOG_PROG, "UBX_RXM_SVSI\n"); - break; -@@ -955,6 +1077,12 @@ - msg[1] = 0x20; /* msg id = UBX_NAV_TIMEGPS */ - msg[2] = 0x01; /* rate */ - (void)ubx_write(session, 0x06u, 0x01, msg, 3); -+#ifdef UBLOXTIMELS_ENABLE -+ msg[0] = 0x01; /* class */ -+ msg[1] = 0x26; /* msg id = UBX_NAV_TIMELS */ -+ msg[2] = 0xff; /* rate */ -+#endif /* UBLOXTIMELS_ENABLE */ -+ (void)ubx_write(session, 0x06u, 0x01, msg, 3); - msg[0] = 0x01; /* class */ - msg[1] = 0x30; /* msg id = NAV-SVINFO */ - msg[2] = 0x0a; /* rate */ diff --git a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt b/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt deleted file mode 100644 index d9bf4b1..0000000 --- a/recipes-navigation/gpsd/gpsd-3.18.1/leap2017Aug31.readme.txt +++ /dev/null @@ -1,169 +0,0 @@ -The purpose of this test is to verify leap second operation with ntp. This is done -by artificially setting the leap second offset in gpsd. ntp is not modified. -Software levels: - gpsd - 3.16-m2.9 + the Aug 31 test patch - ntp - 4.2.8p9-r0.mlinux3.0. Release candidate for mLinux 4.0 - -ntpd leap second test gpsd artificially causes a leap second on Aug 31, 2017 23:59:59 UTC. - -The patch for this test is leap2017Aug31.patch. This patch replaces 0006-ubxtimelps.patch. - - -Kernel Log: - -2017-07-31T18:50:02.012018-05:00 leaptest CROND[5205]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T18:55:01.119140-05:00 leaptest CROND[5223]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T18:59:59.016393-05:00 leaptest kernel: Clock: inserting leap second 23:59:60 UTC -2017-07-31T19:00:01.215873-05:00 leaptest CROND[5240]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) -2017-07-31T19:00:07.381218-05:00 leaptest ntpd[501]: kernel reports leap second has occurred -2017-07-31T19:00:07.381528-05:00 leaptest ntpd[501]: kernel reports leap second has occurred -2017-07-31T19:05:01.313170-05:00 leaptest CROND[5258]: (root) CMD (/usr/sbin/logrotate /etc/logrotate.conf) - - -Time log from user space. 18:59:59 repeats twice 19:00:00 appears only once.: - -2017-07-31T18:59:57.855895-05:00 leaptest CTST: epoch: 1501545597.855 boot: 442607.123 -2017-07-31T18:59:58.106318-05:00 leaptest CTST: epoch: 1501545598.106 boot: 442607.373 -2017-07-31T18:59:58.356758-05:00 leaptest CTST: epoch: 1501545598.356 boot: 442607.624 -2017-07-31T18:59:58.607171-05:00 leaptest CTST: epoch: 1501545598.606 boot: 442607.874 -2017-07-31T18:59:58.857621-05:00 leaptest CTST: epoch: 1501545598.857 boot: 442608.124 -2017-07-31T18:59:59.108072-05:00 leaptest CTST: epoch: 1501545599.107 boot: 442608.375 -2017-07-31T18:59:59.358506-05:00 leaptest CTST: epoch: 1501545599.358 boot: 442608.625 -2017-07-31T18:59:59.608952-05:00 leaptest CTST: epoch: 1501545599.608 boot: 442608.876 -2017-07-31T18:59:59.859364-05:00 leaptest CTST: epoch: 1501545599.859 boot: 442609.126 -2017-07-31T18:59:59.109780-05:00 leaptest CTST: epoch: 1501545599.109 boot: 442609.377 -2017-07-31T18:59:59.360195-05:00 leaptest CTST: epoch: 1501545599.359 boot: 442609.627 -2017-07-31T18:59:59.610608-05:00 leaptest CTST: epoch: 1501545599.610 boot: 442609.877 -2017-07-31T18:59:59.861023-05:00 leaptest CTST: epoch: 1501545599.860 boot: 442610.128 -2017-07-31T19:00:00.111461-05:00 leaptest CTST: epoch: 1501545600.111 boot: 442610.378 -2017-07-31T19:00:00.361916-05:00 leaptest CTST: epoch: 1501545600.361 boot: 442610.629 -2017-07-31T19:00:00.612329-05:00 leaptest CTST: epoch: 1501545600.612 boot: 442610.879 -2017-07-31T19:00:00.862825-05:00 leaptest CTST: epoch: 1501545600.862 boot: 442611.130 -2017-07-31T19:00:01.113251-05:00 leaptest CTST: epoch: 1501545601.112 boot: 442611.380 -2017-07-31T19:00:01.363695-05:00 leaptest CTST: epoch: 1501545601.363 boot: 442611.630 -2017-07-31T19:00:01.614114-05:00 leaptest CTST: epoch: 1501545601.613 boot: 442611.881 -2017-07-31T19:00:01.864524-05:00 leaptest CTST: epoch: 1501545601.864 boot: 442612.131 - - - -Leap second flag set artifically by gpsd, and noticed by ntp (leap=01 for SHM(0) and SHM(2) and leap_armed): -2017-07-31T18:59:22.952281-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:22.962756-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T18:59:22.964152-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.130829-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T18:59:23.131062-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T18:59:23.131258-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T18:59:23.131451-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T18:59:23.131647-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T18:59:23.131840-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T18:59:23.132031-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T18:59:23.132220-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T18:59:23.138000-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.138206-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T18:59:23.138404-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T18:59:23.434429-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T18:59:23.434666-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T18:59:23.434863-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 20 64 377 0.000 6.410 1.265 -2017-07-31T18:59:23.435055-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 19 64 377 0.000 0.062 0.008 -2017-07-31T18:59:23.435249-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:00:22.459905-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.460141-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum - - - -2017-07-31T19:00:22.460343-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.618627-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 16 64 377 0.000 7.369 0.661 -2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 15 64 377 0.000 0.059 0.008 -2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 13 64 377 0.000 1007.48 1000.36 -2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 12 64 377 0.000 1000.05 999.994 -2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt - - -Offset goes to one second, because there was no leap second: -2017-07-31T19:00:22.618857-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:00:22.619057-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:00:22.619252-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:00:22.619444-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:00:22.619634-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:00:22.619824-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:00:22.620016-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:00:22.628414-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.628654-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:00:22.628868-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:00:22.922779-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:00:22.924191-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:00:22.925595-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 16 64 377 0.000 7.369 0.661 -2017-07-31T19:00:22.927000-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 15 64 377 0.000 0.059 0.008 -2017-07-31T19:00:22.928402-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:01:22.942937-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:22.943171-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:01:22.943371-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.118319-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:01:23.118551-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:01:23.118750-05:00 leaptest ntpstatus.sh: 1 18654 943a yes yes none candidate sys_peer 3 -2017-07-31T19:01:23.118943-05:00 leaptest ntpstatus.sh: 2 18655 9649 yes yes none sys.peer leap_armed 4 -2017-07-31T19:01:23.119137-05:00 leaptest ntpstatus.sh: 3 18656 8011 yes no none reject mobilize 1 -2017-07-31T19:01:23.119330-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=01, stratum=0 -2017-07-31T19:01:23.119520-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=01, stratum=0 -2017-07-31T19:01:23.119710-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=11, stratum=14 -2017-07-31T19:01:23.128565-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.128809-05:00 leaptest ntpstatus.sh: ntpq -p -2017-07-31T19:01:23.129026-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:01:23.417707-05:00 leaptest ntpstatus.sh: remote refid st t when poll reach delay offset jitter -2017-07-31T19:01:23.417942-05:00 leaptest ntpstatus.sh: ============================================================================== -2017-07-31T19:01:23.418140-05:00 leaptest ntpstatus.sh: +SHM(0) .GPS. 0 l 13 64 377 0.000 1007.48 1000.36 -2017-07-31T19:01:23.418337-05:00 leaptest ntpstatus.sh: *SHM(2) .PPS. 0 l 12 64 377 0.000 1000.05 999.994 -2017-07-31T19:01:23.418529-05:00 leaptest ntpstatus.sh: LOCAL(0) .LOCL. 14 l - 32 0 0.000 0.000 0.000 -2017-07-31T19:02:23.442898-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.443131-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:02:23.443332-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:02:23.617413-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt - - -Leap second flag is clear, leap_armed is removed so no leap second on Aug 1, 2017: -2017-07-31T19:38:42.630432-05:00 leaptest ntpstatus.sh: ntpq -c lassoc -c mrv &1 &999 leap,srcadr,stratum -2017-07-31T19:38:42.630636-05:00 leaptest ntpstatus.sh: ========================================================== -2017-07-31T19:38:42.791369-05:00 leaptest ntpstatus.sh: ind assid status conf reach auth condition last_event cnt -2017-07-31T19:38:42.791605-05:00 leaptest ntpstatus.sh: =========================================================== -2017-07-31T19:38:42.791803-05:00 leaptest ntpstatus.sh: 1 18654 945a yes yes none candidate sys_peer 5 -2017-07-31T19:38:42.791994-05:00 leaptest ntpstatus.sh: 2 18655 966a yes yes none sys.peer sys_peer 6 -2017-07-31T19:38:42.792189-05:00 leaptest ntpstatus.sh: 3 18656 8033 yes no none reject unreachable 3 -2017-07-31T19:38:42.792379-05:00 leaptest ntpstatus.sh: srcadr=SHM(0), leap=00, stratum=0 -2017-07-31T19:38:42.802875-05:00 leaptest ntpstatus.sh: srcadr=SHM(2), leap=00, stratum=0 -2017-07-31T19:38:42.804254-05:00 leaptest ntpstatus.sh: srcadr=LOCAL(0), leap=00, stratum=14 - - diff --git a/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb b/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb deleted file mode 100644 index d2058ba..0000000 --- a/recipes-navigation/gpsd/gpsd-machine-conf_1.0.bb +++ /dev/null @@ -1,7 +0,0 @@ -SUMMARY = "Machine specific gpsd config" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" - -# empty by default -# BSP layers can add stuff like meta-openmoko example: -# diff --git a/recipes-navigation/gpsd/gpsd/gpsd b/recipes-navigation/gpsd/gpsd/gpsd deleted file mode 100755 index b4068c9..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd +++ /dev/null @@ -1,184 +0,0 @@ -#!/bin/bash -### BEGIN INIT INFO -# Provides: gpsd -# Required-Start: $remote_fs $network -# Should-Start: bluetooth dbus udev -# Required-Stop: $remote_fs $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: GPS (Global Positioning System) daemon start/stop script -# Description: Start/Stop script for the gpsd service daemon, -# which is able to monitor one or more GPS devices -# connected to a host computer, making all data on -# the location and movements of the sensors available -# to be queried on TCP port 2947. -### END INIT INFO - -# Author: Bernd Zeimetz <bzed@debian.org> -# -# Please remove the "Author" lines above and replace them -# with your own name if you copy and modify this script. - -# Do NOT "set -e" - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="GPS (Global Positioning System) daemon" -NAME=gpsd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME -CAPABILITY=/sys/devices/platform/mts-io/capability/gps - -# Read configuration, if present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Exit if we have no GPS capability -( [[ -f $CAPABILITY ]] && (($(cat $CAPABILITY) == 1)) ) || exit 0 - -# Exit if no gps found -([[ -n $GPS_LINE ]] && [[ -c $GPS_LINE ]]) || exit 0 - -# Assemble the GPS devices -# PPS device is needed so GPSD finds the PPS. -if [[ -c $GPS_PPS ]] ; then - : ${GPS_DEVICES:="$GPS_LINE $GPS_PPS"} -else - : ${GPS_DEVICES:="$GPS_LINE"} -fi - - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -if [ -z "$GPSD_SOCKET" ] && [ -z "$GPS_DEVICES" ]; then - GPSD_SOCKET=/var/run/gpsd.sock -fi - -if [ -n "$GPSD_SOCKET" ]; then - GPSD_OPTIONS="$GPSD_OPTIONS -F $GPSD_SOCKET" -fi - -# -# Function that starts the daemon/service -# -do_start() -{ - /usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON --test \ - -- $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES > /dev/null \ - || return 1 - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - - # If the SET_GPS_SPEED function exists, call it to set the GPS Speed. - what=$(type SET_GPS_SPEED 2>/dev/null) - if [[ $what =~ SET_GPS_SPEED[[:space:]]is[[:space:]]a[[:space:]]function ]] ; then - SET_GPS_SPEED - fi - - /usr/sbin/start-stop-daemon -N -20 --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $GPSD_OPTIONS -P $PIDFILE $GPS_DEVICES \ - || return 2 -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - /usr/sbin/start-stop-daemon --stop --quiet --signal KILL --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - /usr/sbin/start-stop-daemon -N -20 --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -do_status() { - NAME=$1 - PIDFILE=$2 - # -t: test only but not stop - start-stop-daemon -K -t --quiet --pidfile $PIDFILE --name $NAME - # exit with status 0 if process is found - if [ "$?" = "0" ]; then - return 0 - else - return 1 - fi -} - -case "$1" in - start) - if ! [[ $ENABLED =~ ^[yY][eE][sS]$ ]] ; then - exit 0 - fi - echo "Starting $DESC" "$NAME" - do_start - exit $? - ;; - stop) - echo "Stopping $DESC" "$NAME" - do_stop - exit $? - ;; - status) - echo -n "status $NAME ... " - do_status "$NAME" "$PIDFILE" - if [ "$?" = "0" ]; then - echo "running" - exit 0 - else - echo "stopped" - exit 1 - fi - ;; - reload|force-reload) - echo "Reloading $DESC" "$NAME" - do_reload - exit $? - ;; - restart) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - echo "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - exit $? - ;; - *) - # Failed to stop - exit 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/recipes-navigation/gpsd/gpsd/gpsd-default b/recipes-navigation/gpsd/gpsd/gpsd-default deleted file mode 100644 index fa67fd1..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd-default +++ /dev/null @@ -1,76 +0,0 @@ -ENABLED="yes" - -# GPSD control socket for sending GPSD commands. -# GPSD_SOCKET="/var/run/gpsd.sock" - -GPSD_OPTIONS="-n -D 1" - -# Conduit 0.1 GPS devices -GPS_LINE=/dev/gps0 -GPS_PPS=/dev/pps0 - -# Highest speed permitted by uBlox. -GPS_BAUD=115200 - -# Use this if you must use a specific pps -# that does not exist prior to gpsd running. -# GPS_DEVICES="/dev/gps1 /dev/pps1" - -GPS_FIXFILE=/var/run/gpsfix - -# GPSD Json TPV object, mode field. -# See: http://www.catb.org/gpsd/gpsd_json.html -# -# 0 Unknown -# 1 No fix -# 2 2D fix -# 3 3D fix -GPSFIX="3" - -# U-Blox defaults to 9600. If the -# default speed is not set before changing -# the baud rate, this does not work -# except right after a boot when the speed -# is 9600 baud. -# -# 115200 baud is preferred to reduce the CPU -# load. Also, u-blox mode is preferred to -# nmea, as it is more efficient. -# -# We check for U-Blox first, because -# we do not set the baud rate of other -# GPS types. -# -# This gpsctl does not always work, because -# the line speed might be wrong, so if we -# fail, we change the baud rate and try again. -# -# There should only be two speeds, 115200 -# or 9600. -# -# If the line speed is already 115200, we -# should not need to change the baud rate. -# -function SET_GPS_SPEED { -if [[ $(mts-io-sysfs show hw-version) =~ ^MTHS- ]] ; then - if gpsctl -t 'u-blox' -D 5 -x '\x06\x41\x00\x00\x03\x1F\x90\x47\x4F\xB1\xFF\xFF\xEA\xFF' $GPS_LINE ; then - logger -s -t 'gpsd info' -p daemon.info "GPS LNA set high" - else - logger -s -t 'gpsd info' -p daemon.alert "ERROR: GPS LNA not set" - fi -fi - -if [[ $(cat /run/config/gpstype) == u-blox ]] ; then - # Set the baud rate. Works better with ntp at a higher baud rate. - if ! gpsctl -T 20 -t 'u-blox' -s $GPS_BAUD -b -f $GPS_LINE ; then - echo 'WARNING: Unable to set GPS serial port speed.' - else - # The next line is needed due to a bug in gpsctl. - # We will go back to the default baud rate if we don't do this step. - echo Expect a timeout error here. Need this error. - gpsctl -T 2 -f $GPS_LINE - stty -F $GPS_LINE $GPS_BAUD - fi -fi # End of U-Blox GPS type -} - diff --git a/recipes-navigation/gpsd/gpsd/gpsd.rules b/recipes-navigation/gpsd/gpsd/gpsd.rules deleted file mode 100644 index dc90ad6..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd.rules +++ /dev/null @@ -1,50 +0,0 @@ -# udev rules for gpsd -# $Id$ -# -# GPSes don't have their own USB device class. They're serial-over-USB -# devices, so what you see is actually the ID of the serial-over-USB chip. -# Fortunately, just two of these account for over 80% of consumer-grade -# GPS sensors. The gpsd.hotplug.wrapper script will tell a running gpsd -# that it should look at the device that just went active, because it -# might be a GPS. -# -# The following setup works on Debian - something similar will apply on -# other distributions: -# -# /etc/udev/gpsd.rules -# /etc/udev/rules.d/025_gpsd.rules -> ../gpsd.rules -# /lib/udev/gpsd.hotplug.wrapper -# /lib/udev/gpsd.hotplug -# -# Setting the link in /etc/udev/rules.d activates the rule and determines -# when to run it on boot (similar to init.d processing). - -SUBSYSTEM!="tty", GOTO="gpsd_rules_end" - -# Prolific Technology, Inc. PL2303 Serial Port -ATTR{idVendor}=="067b", ATTR{idProduct}=="2303", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# ATEN International Co., Ltd UC-232A Serial Port [pl2303] -ATTR{idVendor}=="0557", ATTR{idProduct}=="2008", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# FTDI 8U232AM -ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Cypress M8/CY7C64013 (DeLorme uses these) -ATTR{idVendor}=="1163", ATTR{idProduct}=="0100", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# PS-360 OEM (Microsoft GPS sold with Street and Trips 2005) -ATTR{idVendor}=="067b", ATTR{idProduct}=="aaa0", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Garmin International GPSmap, various models (tested with Garmin GPS 18 USB) -ATTR{idVendor}=="091e", ATTR{idProduct}=="0003", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# Cygnal Integrated Products, Inc. CP210x Composite Device (Used by Holux m241) -ATTR{idVendor}=="10c4", ATTR{idProduct}=="ea60", SYMLINK+="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# u-blox AG, u-blox 5 (tested with Navilock NL-402U) -ATTR{idVendor}=="1546", ATTR{idProduct}=="01a5", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# FTDI FT232 -ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" -# u-blox 4 -ATTR{idVendor}=="1546", ATTR{idProduct}=="01a4", SYMLINK="gps%n", RUN+="/lib/udev/gpsd.hotplug.wrapper" - -# mLinux does not come with gpsd.hotplug.wrapper -# ACTION=="remove", RUN+="/lib/udev/gpsd.hotplug.wrapper" - -KERNEL=="ttyXRUSB2", SYMLINK+="gps0" -KERNEL=="pps0", OWNER="root", GROUP="tty", MODE="0660", SYMLINK+="gpspps0" -LABEL="gpsd_rules_end" diff --git a/recipes-navigation/gpsd/gpsd/gpsd.service b/recipes-navigation/gpsd/gpsd/gpsd.service deleted file mode 100644 index 7131a58..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=GPS (Global Positioning System) Daemon -Requires=gpsd.socket - -[Service] -EnvironmentFile=/etc/default/gpsd -ExecStart=/usr/sbin/gpsd -N $GPS_DEVICES - -[Install] -Also=gpsd.socket diff --git a/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh b/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh deleted file mode 100644 index 915c7be..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd_fixed.sh +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/bash -# This script filters the gpspipe -w -# (json) output from GPSD. The GPS fix -# is taken from the mode parameter of -# the GPSD TPV object in the json output. -# Values are: -# -# 0 Unseen -# 1 No fix -# 2 2D -# 3 3D -# -# Fix file creation for GPS. -# If GPS reaches expected -# fix level, file GSP_FIXFILE is created. -# This is to know when to set the system -# and hardware clock, and when -# it is safe to start ntp. -# DEBUG=1 to set debug -NAME=gpsd_ubx_fixed -shopt -s expand_aliases -alias LG="logger -t ${NAME}" -if [[ -r /etc/default/gpsd ]] ; then - . /etc/default/gpsd -else - echo "Must configure GPSD requirements" - exit 1 -fi - -function rm_gps_file -{ - if [[ -n "${GPS_FIXFILE}" ]] && [[ -f ${GPS_FIXFILE} ]] ; then - rm -f "${GPS_FIXFILE}" - fi -} -function kill_it -{ - cmd=$1 - pid=$2 - sig=$3 - ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}" - kill -SIG${sig} ${pid} >/dev/null 2>&1 - result=$? - ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result" -} - -# Most exits are errors, so remove the GPS fix file. -trap rm_gps_file EXIT - -if ! [[ -x /usr/bin/gpspipe ]] ; then - LG -p user.err "Please install gpspipe" - exit 0 -fi - -# Terminate gpspipe after 10 seconds if it is our child -# gpspipe has issues with terminals and stalling on terminal -# read of the console. -( - sleep 10 - # We use BASHPID because our parent, $$, may have already exited, and - # then ps will not work. BASHPID is the current subshell. - ppid=$BASHPID - pgid=$(ps --no-heading -o pgid -p $ppid) - - if ((${#pgid} == 0)) ; then - LG -p user.err "Could not find a pgid for $ppid" - ps -fjp $ppid | LG -p user.error - fi - - # pgrep does not work during boot. - pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//') - gpspipepid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpspipe$' | sed 's/[[:space:]].*//') - - ((DEBUG)) && LG -p user.info "$pgid is pgid $gpspipepid is gpspipepid" - # Find the gpspipepid that is our grandchild - ((didkill=0)) - - # for loop is in case gpspipepid has children. - for p in ${gpspipepid} ; do - if ((${#p})) ; then - kill_it gpspipe $p TERM - ((didkill=p)) - break - fi - done - if ((didkill == 0)) ; then - exit 0 - fi - # Do a sigkill to be sure. - sleep 2 - kill_it gpspipe $didkill KILL -) & - -fix="" -status="" - -# egrep in busybox has a horrible buffering issue. -# echo My shell pid is $$ -# echo Place data fix, status -fix="$(gpspipe -w | grep -m1 '{"class":"TPV","device":"/dev/gps0",.*"mode":' | sed -e 's/.*"mode"://' -e 's/[},].*//')" - -if ((${#fix} == 0)) ; then - LG -p user.err "No data from GPS" - exit 1 -fi - - -# echo "status is $status. fixOK is $fixOK" - - -# echo "fix is $fix. Is it in $GPSFIX?" -# Test the GPS fixOK -for x in $GPSFIX ; do - # echo test $x with $fix - if [[ $x == $fix ]] ; then - LG -p user.info "GPS has fix $fix found in list GPSFIX: $GPSFIX" - echo $x >"${GPS_FIXFILE}" - GPS_FIXFILE="" - exit 0 - fi -done - -LG -p user.info "GPS fix is bad: $fix and should be one of: $GPSFIX" -# Start later -exit 1 diff --git a/recipes-navigation/gpsd/gpsd/gpsd_settime.sh b/recipes-navigation/gpsd/gpsd/gpsd_settime.sh deleted file mode 100755 index e8e8f26..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd_settime.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -# Get the time from gpspipe, and if present, set the time. -# DEBUG=1 to set debug -NAME=gpsd_ubx_settime -shopt -s expand_aliases -alias LG="logger -t $NAME" -function kill_it -{ - cmd=$1 - pid=$2 - sig=$3 - ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}" - kill -SIG${sig} ${pid} - result=$? - ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result" -} - -trap "stty echo icanon" exit - -OIFS=$IFS -IFS=$'\n' -if ! /usr/sbin/gpsd_fixed </dev/null ; then - LG -s -p user.warn "GPS does not have a fix yet. Try again later." - exit 1 -fi - - -# Terminate gpspipe after 10 seconds if it is our child -# gpspipe has issues with terminals and stalling on terminal -# read of the console. -( - sleep 10 - ppid=$BASHPID - pgid=$(ps --no-heading -o pgid -p $ppid) - - if ((${#pgid} == 0)) ; then - LG -p user.err "Could not find a pgid for $ppid" - ps -fjp $ppid | LG -p user.error - fi - - # pgrep does not work during boot. - pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//') - gpspipepid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpspipe$' | sed 's/[[:space:]].*//') - - ((DEBUG)) && LG -p user.info "$pgid is pgid $gpspipepid is gpspipepid" - # Find the gpspipepid that is our grandchild - ((didkill=0)) - - # for loop is in case gpspipepid has children. - for p in ${gpspipepid} ; do - if ((${#p})) ; then - kill_it gpspipe $p TERM - ((didkill=p)) - break - fi - done - if ((didkill == 0)) ; then - exit 0 - fi - # Do a sigkill to be sure. - sleep 2 - kill_it gpspipe $didkill KILL -) & - -# Get the ISO8601 time from GPSD -ISO8601=$(gpspipe -w | egrep -m1 '\{"class":"TPV","device":"/dev/gps0"(,"status":[0-9])*,"mode":3,"time":"' | sed -e 's/.*,"time":"//' -e 's/Z",.*//') - -if (( ${#ISO8601} > 18 )) ; then - LG -p user.warn "Updating time to time, ${ISO8601}." - [[ $ISO8601 =~ ([^-]*)-([^-]*)-([^T]*)T([^:]*):([^:]*):([^\.]*)\. ]] - Y=${BASH_REMATCH[1]} - M=${BASH_REMATCH[2]} - D=${BASH_REMATCH[3]} - h=${BASH_REMATCH[4]} - m=${BASH_REMATCH[5]} - s=${BASH_REMATCH[6]} -fi -if ((${#Y} == 4 )) && ((${#M} > 0)) && ((${#D} > 0)) && ((${#h} > 0)) && ((${#m} > 0)) && ((${#s} > 0)) ; then - date -u "${Y}.${M}.${D}-${h}:${m}:${s}" >/dev/null -else - LG -p user.err "gpspipe output is bad or missing" - exit 1 -fi -exit 0 diff --git a/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh b/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh deleted file mode 100755 index 82254c2..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd_ubx_fixed.sh +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/bash -# This script is deprecated. -# Use gpsd_fixed instead. -# Fix file creation for U-Blox GPS. -# If GPS reaches expected -# fix level, file GSP_FIXFILE is created. -# This is to know when to set the system -# and hardware clock, and when -# it is safe to start ntp. -# DEBUG=1 to set debug -# -NAME=gpsd_ubx_fixed -shopt -s expand_aliases -alias LG=logger\ -t\ ${NAME} -if [[ -r /etc/default/gpsd ]] ; then - . /etc/default/gpsd -else - echo "Must configure GPSD requirements" - exit 1 -fi -UBXNAVSOL='b56201063400' -UBXNAVSOLLEN=60 - -function rm_gps_file -{ - if [[ -n "${GPS_FIXFILE}" ]] && [[ -f ${GPS_FIXFILE} ]] ; then - rm -f "${GPS_FIXFILE}" - fi -} -function kill_it -{ - cmd=$1 - pid=$2 - sig=$3 - ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}" - kill -SIG${sig} ${pid} >/dev/null 2>&1 - result=$? - ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result" -} - - -# Most exits are errors, so remove the GPS fix file. -trap rm_gps_file EXIT - -if ! [[ -x /usr/bin/gpsmon ]] ; then - LG -p user.err "Please install gpsmon" - exit 0 -fi - -# Terminate gpsmon after 10 seconds if it is our child -# gpsmon has issues with terminals and stalling on terminal -# read of the console. -( - sleep 10 - # We use BASHPID because our parent, $$, may have already exited, and - # then ps will not work. BASHPID is the current subshell. - ppid=$BASHPID - pgid=$(ps --no-heading -o pgid -p $ppid) - - if ((${#pgid} == 0)) ; then - LG -p user.err "Could not find a pgid for $ppid" - ps -fjp $ppid | LG -p user.error - fi - - # pgrep does not work during boot. - pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//') - gpsmonpid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpsmon$' | sed 's/[[:space:]].*//') - - ((DEBUG)) && LG -p user.info "$pgid is pgid $gpsmonpid is gpsmonpid" - # Find the gpsmonpid that is our grandchild - ((didkill=0)) - - # for loop is in case gpsmonpid has children. - for p in ${gpsmonpid} ; do - if ((${#p})) ; then - kill_it gpsmon $p TERM - ((didkill=p)) - break - fi - done - if ((didkill == 0)) ; then - exit 0 - fi - # Do a sigkill to be sure. - sleep 2 - kill_it gpsmon $didkill KILL -) & - -fix="" -status="" - -# egrep in busybox has a horrible buffering issue. -# echo My shell pid is $$ -# echo Place data fix, status -stuff="$(gpsmon -a 2>&1 | { - OIFS=${IFS} - IFS=$'\n' - while read ln ; do - if [[ $ln =~ ^[[:space:]]*\(${UBXNAVSOLLEN}\)[[:space:]]*${UBXNAVSOL}....................(..)(.) ]] ; then - IFS=${OIFS} - fix="${BASH_REMATCH[1]}" - if ((${#fix} == 0)) ; then - fix="unknown" - fi - status=$(echo "${BASH_REMATCH[2]}") - if ((${#status} == 0)) ; then - status="unknown" - fi - break; - fi - oldln="${ln}" - done - if ((${#fix})) && ((${#status})) ; then - echo "$fix,$status" - else - echo "${oldln}" - fi -})" - -if ((${#stuff} == 0)) ; then - LG -p user.err "No data from GPS" - exit 1 -fi - -if [[ -t 1 ]] ; then - stty echo icanon 2>/dev/null -fi - -OIFS=${IFS} -IFS=, -set $stuff -fix="$1" -status="$2" -IFS=${OIFS} - -# fixOK is the least significant bit of a hex single digit -case $status in - [13579bBdDfF]) - ((fixOK=1)) - ;; - [02468aAcCeE]) - ((fixOK=0)) - ;; - *) - LG -p user.err "Is GPSD running?" - LG -p user.err "FIX OK field should be single hex digit: gpsmon data: $stuff" - exit 1 - break - ;; -esac - -# echo "status is $status. fixOK is $fixOK" - - -if ((fixOK == 0)) ; then - LG -p user.err "Problem with the GPS fix. The fix is an even value, \"$status\", and should be an odd value. fixOK=${fixOK}" - exit 1 - # Retry later. How? -fi - -# echo "fix is $fix. Is it in $GPSFIX?" -# Test the GPS fixOK -for x in $GPSFIX ; do - # echo test $x with $fix - if [[ $x == $fix ]] ; then - LG -p user.info "GPS has fix $fix found in list GPSFIX: $GPSFIX" - echo $x >"${GPS_FIXFILE}" - GPS_FIXFILE="" - exit 0 - fi -done - -LG -p user.info "GPS fix is bad: $fix and should be one of: $GPSFIX" -# Start later -exit 1 - diff --git a/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh b/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh deleted file mode 100755 index b497138..0000000 --- a/recipes-navigation/gpsd/gpsd/gpsd_ubx_settime.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash -# This function is deprecated. -# Use gpsd_settime instead. -# PPS= 1484247472.29561104 clock= 1484247990.00000000 offset= 517.704388959 -# DEBUG=1 to set debug -NAME=gpsd_ubx_settime -shopt -s expand_aliases -alias LG="logger -t $NAME" -function kill_it -{ - cmd=$1 - pid=$2 - sig=$3 - ((DEBUG)) && LG -p user.info "terminating $cmd(${pid}) with SIG${sig}" - kill -SIG${sig} ${pid} - result=$? - ((DEBUG)) && LG -p user.info "kill -SIG${sig} ${pid} result is $result" -} - -trap "stty echo icanon" exit - -OIFS=$IFS -IFS=$'\n' -if ! /usr/sbin/gpsd_ubx_fixed </dev/null ; then - LG -s -p user.warn "GPS does not have a fix yet. Try again later." - exit 1 -fi - - -# Terminate gpsmon after 10 seconds if it is our child -# gpsmon has issues with terminals and stalling on terminal -# read of the console. -( - sleep 10 - ppid=$BASHPID - pgid=$(ps --no-heading -o pgid -p $ppid) - - if ((${#pgid} == 0)) ; then - LG -p user.err "Could not find a pgid for $ppid" - ps -fjp $ppid | LG -p user.error - fi - - # pgrep does not work during boot. - pgrpmemb=$(ps --no-heading -o pgid,pid,comm -e | grep '^ *'"${pgid}"' *' | sed -r 's/^ *[0-9]+ *//') - gpsmonpid=$(echo "${pgrpmemb}" | egrep '[[:space:]]gpsmon$' | sed 's/[[:space:]].*//') - - ((DEBUG)) && LG -p user.info "$pgid is pgid $gpsmonpid is gpsmonpid" - # Find the gpsmonpid that is our grandchild - ((didkill=0)) - - # for loop is in case gpsmonpid has children. - for p in ${gpsmonpid} ; do - if ((${#p})) ; then - kill_it gpsmon $p TERM - ((didkill=p)) - break - fi - done - if ((didkill == 0)) ; then - exit 0 - fi - # Do a sigkill to be sure. - sleep 2 - kill_it gpsmon $didkill KILL -) & - -epoch=$(gpsmon -a 2>&1 | ( while read ln ; do - if [[ $ln =~ ^[[:space:]]*PPS=.*clock=[[:space:]]*([0-9]*)\. ]] ; then - echo ${BASH_REMATCH[1]} - break - fi -done )) -if [[ $epoch =~ ^[0-9]+$ ]] ; then - LG -p user.warn "Updating time to epoch time, ${epoch}." - date +%s -s @${epoch} >/dev/null -else - LG -p user.err "gpsmon output is bad." - exit 1 -fi -exit 0 diff --git a/recipes-navigation/gpsd/gpsd_3.16.bb b/recipes-navigation/gpsd/gpsd_3.16.bb deleted file mode 100644 index 26a8963..0000000 --- a/recipes-navigation/gpsd/gpsd_3.16.bb +++ /dev/null @@ -1,221 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "virtual/gpsd" -PR="m14" - -EXTRANATIVEPATH += "chrpath-native" - -# file://0002-SConstruct-remove-rpath.patch -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://0005-suppress-text-in-binary.patch \ - file://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ - file://0006-sysclockcrash.patch \ - file://0008-major_gnu.patch \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_ubx_fixed.sh \ - file://gpsd_ubx_settime.sh \ - file://gpsd_settime.sh \ - file://gpsd_fixed.sh \ - file://gpsd.rules \ - file://gpsd.service \ -" -# Fixed -# file://0001-Check-for-__STDC_NO_ATOMICS__-before-using-stdatomic.patch -# file://0002-Add-a-test-for-C11-and-check-we-have-C11-before-usin.patch -# file://0003-Whoops-check-for-C11-not-for-not-C11-in-stdatomic.h-.patch -# file://0001-Include-stdatomic.h-only-in-C-mode.patch -# file://0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch - -SRC_URI[md5sum] = "68691b5de4c94f82ec4062b042b5eb63" -SRC_URI[sha256sum] = "03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029" - - -inherit scons update-rc.d python-dir pythonnative systemd - -INITSCRIPT_NAME = "gpsd" -INITSCRIPT_PARAMS = "defaults 10" - -SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" - -export STAGING_INCDIR -export STAGING_LIBDIR - -# Necessary for python -export BUILD_SYS -export HOST_SYS - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}" -PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='true' \ - strip='false' \ - chrpath='yes' \ - systemd='${SYSTEMD_OESCONS}' \ - libdir='${libdir}' \ - ashtech='no' \ - earthmate='no' \ - evermore='no' \ - fury='no' \ - fv18='no' \ - garmin='no' \ - garmintxt='no' \ - geostar='no' \ - greis='no' \ - itrax='no' \ - mtk3301='no' \ - navcom='no' \ - nmea0183='yes' \ - nmea2000='no' \ - oncore='no' \ - sirf='no' \ - skytraq='yes' \ - superstar2='no' \ - tnt='no' \ - tripmate='no' \ - tsip='no' \ - ublox='yes' \ - ubloxtimels='yes' \ - aivdm='no' \ - gpsclock='no' \ - oceanserver='no' \ - fixed_stop_bits='1' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - ${PACKAGECONFIG_CONFARGS} \ -" -# this cannot be used, because then chrpath is not found and only static lib is built -# target=${HOST_SYS} - -do_compile_prepend() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" -} - -do_install() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" - - export DESTDIR="${D}" - # prefix is used for RPATH and DESTDIR/prefix for instalation - ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ - bbfatal "scons install execution failed." -} - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ - install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed - install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime - install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed - install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime - - #support for udev - install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d - install -d ${D}${base_libdir}/udev/ - install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ - - #support for python - install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - - #support for systemd - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service - install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps -} - -# Use libgps recipe for sysroot. -do_populate_sysroot() { -} - -RDEPENDS_${PN}-conf += "bash" - -pkg_postinst_${PN}-conf() { - update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10 -} - -pkg_postrm_${PN}-conf() { - update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default -} - -PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpspipe gps-utils" - -# File does not exist: ${libdir}/libQgpsmm.prl -# FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ -# ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps" - -FILES_${PN} += "${sbindir}/gpsd_*" - -FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" - -RDEPENDS_${PN} = "gpsd-gpsctl bash" -RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf" - -SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging" -FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_${PN}-udev += "udev gpsd-conf" - -SUMMARY_libgpsd = "C service library used for communicating with gpsd" -FILES_libgpsd = "${libdir}/libgpsd.so.*" - -SUMMARY_libgps = "C service library used for communicating with gpsd" -FILES_libgps = "${libdir}/libgps.so.*" - -SUMMARY_${PN}-conf = "gpsd configuration files and init scripts" -FILES_${PN}-conf = "${sysconfdir}" -CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes" -FILES_${PN}-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences" -FILES_gpspipe = "${bindir}/gpspipe" - -SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" -FILES_gps-utils = "${bindir}/*" -RDEPENDS_gps-utils = "python-pygps" - -SUMMARY_python-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-pygps = " \ - python-core \ - python-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${PN}.socket" diff --git a/recipes-navigation/gpsd/gpsd_3.16.bb.old b/recipes-navigation/gpsd/gpsd_3.16.bb.old deleted file mode 100644 index 1464981..0000000 --- a/recipes-navigation/gpsd/gpsd_3.16.bb.old +++ /dev/null @@ -1,217 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "virtual/gpsd" -PR="m12" - -EXTRANATIVEPATH += "chrpath-native" - -# file://0002-SConstruct-remove-rpath.patch -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://0005-suppress-text-in-binary.patch \ - file://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ - file://0006-sysclockcrash.patch \ - file://0008-major_gnu.patch \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_ubx_fixed.sh \ - file://gpsd_ubx_settime.sh \ - file://gpsd.rules \ - file://gpsd.service \ -" -# Fixed -# file://0001-Check-for-__STDC_NO_ATOMICS__-before-using-stdatomic.patch -# file://0002-Add-a-test-for-C11-and-check-we-have-C11-before-usin.patch -# file://0003-Whoops-check-for-C11-not-for-not-C11-in-stdatomic.h-.patch -# file://0001-Include-stdatomic.h-only-in-C-mode.patch -# file://0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch - -SRC_URI[md5sum] = "68691b5de4c94f82ec4062b042b5eb63" -SRC_URI[sha256sum] = "03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029" - - -inherit scons update-rc.d python-dir pythonnative systemd - -INITSCRIPT_NAME = "gpsd" -INITSCRIPT_PARAMS = "defaults 10" - -SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" - -export STAGING_INCDIR -export STAGING_LIBDIR - -# Necessary for python -export BUILD_SYS -export HOST_SYS - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}" -PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='true' \ - strip='false' \ - chrpath='yes' \ - systemd='${SYSTEMD_OESCONS}' \ - libdir='${libdir}' \ - ashtech='no' \ - earthmate='no' \ - evermore='no' \ - fury='no' \ - fv18='no' \ - garmin='no' \ - garmintxt='no' \ - geostar='no' \ - greis='no' \ - itrax='no' \ - mtk3301='no' \ - navcom='no' \ - nmea0183='yes' \ - nmea2000='no' \ - oncore='no' \ - sirf='no' \ - skytraq='yes' \ - superstar2='no' \ - tnt='no' \ - tripmate='no' \ - tsip='no' \ - ublox='yes' \ - ubloxtimels='yes' \ - aivdm='no' \ - gpsclock='no' \ - oceanserver='no' \ - fixed_stop_bits='1' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - ${PACKAGECONFIG_CONFARGS} \ -" -# this cannot be used, because then chrpath is not found and only static lib is built -# target=${HOST_SYS} - -do_compile_prepend() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" -} - -do_install() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" - - export DESTDIR="${D}" - # prefix is used for RPATH and DESTDIR/prefix for instalation - ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ - bbfatal "scons install execution failed." -} - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ - install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed - install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime - - #support for udev - install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${WORKDIR}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d - install -d ${D}${base_libdir}/udev/ - install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ - - #support for python - install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - - #support for systemd - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service - install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps -} - -# Use libgps recipe for sysroot. -do_populate_sysroot() { -} - -RDEPENDS_${PN}-conf += "bash" - -pkg_postinst_${PN}-conf() { - update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10 -} - -pkg_postrm_${PN}-conf() { - update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default -} - -PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpspipe gps-utils" - -# File does not exist: ${libdir}/libQgpsmm.prl -# FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ -# ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps" - -FILES_${PN} += "${sbindir}/gpsd_ubx_fixed ${sbindir}/gpsd_ubx_settime" - -FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" - -RDEPENDS_${PN} = "gpsd-gpsctl bash" -RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf" - -SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging" -FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_${PN}-udev += "udev gpsd-conf" - -SUMMARY_libgpsd = "C service library used for communicating with gpsd" -FILES_libgpsd = "${libdir}/libgpsd.so.*" - -SUMMARY_libgps = "C service library used for communicating with gpsd" -FILES_libgps = "${libdir}/libgps.so.*" - -SUMMARY_${PN}-conf = "gpsd configuration files and init scripts" -FILES_${PN}-conf = "${sysconfdir}" -CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes" -FILES_${PN}-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences" -FILES_gpspipe = "${bindir}/gpspipe" - -SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" -FILES_gps-utils = "${bindir}/*" -RDEPENDS_gps-utils = "python-pygps" - -SUMMARY_python-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-pygps = " \ - python-core \ - python-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${PN}.socket" diff --git a/recipes-navigation/gpsd/gpsd_3.18.1.bb b/recipes-navigation/gpsd/gpsd_3.18.1.bb deleted file mode 100644 index 0b0a287..0000000 --- a/recipes-navigation/gpsd/gpsd_3.18.1.bb +++ /dev/null @@ -1,237 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "virtual/gpsd" -PR="m7" - -EXTRANATIVEPATH += "chrpath-native" - -# sysclockcrash is fixed for gpsd -# suppress text in binary is fixed for gpsctl - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ - ${SAVANNAH_GNU_MIRROR}/gpsd/gpsd-${PV}.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://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_ubx_fixed.sh \ - file://gpsd_ubx_settime.sh \ - file://gpsd_fixed.sh \ - file://gpsd_settime.sh \ - file://gpsd.rules \ - file://gpsd.service \ -" -SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" -SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" - -inherit scons update-rc.d python-dir pythonnative systemd - -INITSCRIPT_NAME = "gpsd" -INITSCRIPT_PARAMS = "defaults 10" - -SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" - -export STAGING_INCDIR -export STAGING_LIBDIR - -# Necessary for python -export BUILD_SYS -export HOST_SYS - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}" -PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" - -# Remove unneeded features. netfeed is needed by gpsmon -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='true' \ - strip='false' \ - chrpath='yes' \ - systemd='${SYSTEMD_OESCONS}' \ - libdir='${libdir}' \ - ublox='yes' \ - ubloxtimels='yes' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - prefix='usr' \ - control_socket='false' \ - nofloats='yes' \ - ashtech='false' \ - earthmate='false' \ - evermore='false' \ - fury='false' \ - fv18='false' \ - garmin='false' \ - garmintxt='false' \ - geostar='false' \ - greis='false' \ - itrax='false' \ - mtk3301='false' \ - navcom='false' \ - nmea0183='true' \ - nmea2000='false' \ - oncore='false' \ - sirf='false' \ - skytraq='false' \ - superstar2='false' \ - tnt='false' \ - tripmate='false' \ - tsip='false' \ - ublox='true' \ - aivdm='false' \ - gpsclock='false' \ - isync='false' \ - ntrip='false' \ - oceanserver='false' \ - passthrough='false' \ - rtcm104v2='false' \ - rtcm104v3='false' \ - bluez='false' \ - ipv6='false' \ - netfeed='true' \ - usb='false' \ - ${PACKAGECONFIG_CONFARGS} \ -" -# this cannot be used, because then chrpath is not found and only static lib is built -# target=${HOST_SYS} - -do_compile_prepend() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" -} - -do_install() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" - - export DESTDIR="${D}" - # prefix is used for RPATH and DESTDIR/prefix for instalation - ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ - bbfatal "scons install execution failed." -} - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ - install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed - install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime - install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed - install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime - - - #support for udev - install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${S}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d - install -d ${D}${base_libdir}/udev/ - install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ - - #support for python - install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - - #support for systemd - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service - install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps - - # New ubxtool - install -m 0755 ${S}/ubxtool ${D}/${bindir} - install -m 0644 ${S}/ubxtool.1 ${D}/${mandir}/man1 -} - -RDEPENDS_${PN}-conf += "bash" - -pkg_postinst_${PN}-conf() { - update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10 -} - -pkg_postrm_${PN}-conf() { - update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default -} - -PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpspipe gps-utils" - -# File does not exist: ${libdir}/libQgpsmm.prl -FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ - ${libdir}/libQgpsmm.prl \ - ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps" - -FILES_${PN} += "${sbindir}/gpsd_*" - -FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" - -RDEPENDS_${PN} = "gpsd-gpsctl bash" - -# gpsd-udev is for USB, which we are not using -RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf" - -SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging" -FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_${PN}-udev += "eudev gpsd-conf" - -SUMMARY_libgpsd = "C service library used for communicating with gpsd" -FILES_libgpsd = "${libdir}/libgpsd.so.*" - -SUMMARY_libgps = "C service library used for communicating with gpsd" -FILES_libgps = "${libdir}/libgps.so.*" - -SUMMARY_${PN}-conf = "gpsd configuration files and init scripts" -FILES_${PN}-conf = "${sysconfdir}" -CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes" -FILES_${PN}-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences" -FILES_gpspipe = "${bindir}/gpspipe" - -SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" -FILES_gps-utils = "${bindir}/*" -RDEPENDS_gps-utils = "python-pygps" - -SUMMARY_python-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-pygps = " \ - python-core \ - python-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.socket ${BPN}ctl@.service" - - -ALTERNATIVE_${PN} = "gpsd-defaults" -ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd" -ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default" diff --git a/recipes-navigation/gpsd/gpsd_3.18.1.bb.save b/recipes-navigation/gpsd/gpsd_3.18.1.bb.save deleted file mode 100644 index bbc1f88..0000000 --- a/recipes-navigation/gpsd/gpsd_3.18.1.bb.save +++ /dev/null @@ -1,236 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "virtual/gpsd" -PR="m7" - -EXTRANATIVEPATH += "chrpath-native" - -# sysclockcrash is fixed for gpsd -# suppress text in binary is fixed for gpsctl - -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://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ - file://gpsd-default \ - file://gpsd \ - file://gpsd_ubx_fixed.sh \ - file://gpsd_ubx_settime.sh \ - file://gpsd_fixed.sh \ - file://gpsd_settime.sh \ - file://gpsd.rules \ - file://gpsd.service \ -" -SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" -SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" - -inherit scons update-rc.d python-dir pythonnative systemd - -INITSCRIPT_NAME = "gpsd" -INITSCRIPT_PARAMS = "defaults 10" - -SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" - -export STAGING_INCDIR -export STAGING_LIBDIR - -# Necessary for python -export BUILD_SYS -export HOST_SYS - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}" -PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" - -# Remove unneeded features. netfeed is needed by gpsmon -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='true' \ - strip='false' \ - chrpath='yes' \ - systemd='${SYSTEMD_OESCONS}' \ - libdir='${libdir}' \ - ublox='yes' \ - ubloxtimels='yes' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - prefix='usr' \ - control_socket='false' \ - nofloats='yes' \ - ashtech='false' \ - earthmate='false' \ - evermore='false' \ - fury='false' \ - fv18='false' \ - garmin='false' \ - garmintxt='false' \ - geostar='false' \ - greis='false' \ - itrax='false' \ - mtk3301='false' \ - navcom='false' \ - nmea0183='true' \ - nmea2000='false' \ - oncore='false' \ - sirf='false' \ - skytraq='false' \ - superstar2='false' \ - tnt='false' \ - tripmate='false' \ - tsip='false' \ - ublox='true' \ - aivdm='false' \ - gpsclock='false' \ - isync='false' \ - ntrip='false' \ - oceanserver='false' \ - passthrough='false' \ - rtcm104v2='false' \ - rtcm104v3='false' \ - bluez='false' \ - ipv6='false' \ - netfeed='true' \ - usb='false' \ - ${PACKAGECONFIG_CONFARGS} \ -" -# this cannot be used, because then chrpath is not found and only static lib is built -# target=${HOST_SYS} - -do_compile_prepend() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" -} - -do_install() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" - - export DESTDIR="${D}" - # prefix is used for RPATH and DESTDIR/prefix for instalation - ${STAGING_BINDIR_NATIVE}/scons prefix=${prefix} install ${EXTRA_OESCONS}|| \ - bbfatal "scons install execution failed." -} - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gpsd ${D}/${sysconfdir}/init.d/ - install -d ${D}/${sysconfdir}/default - install -m 0644 ${WORKDIR}/gpsd-default ${D}/${sysconfdir}/default/gpsd.default - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/gpsd_ubx_fixed.sh ${D}${sbindir}/gpsd_ubx_fixed - install -m 0755 ${WORKDIR}/gpsd_ubx_settime.sh ${D}${sbindir}/gpsd_ubx_settime - install -m 0755 ${WORKDIR}/gpsd_fixed.sh ${D}${sbindir}/gpsd_fixed - install -m 0755 ${WORKDIR}/gpsd_settime.sh ${D}${sbindir}/gpsd_settime - - - #support for udev - install -d ${D}/${sysconfdir}/udev/rules.d - install -m 0644 ${S}/gpsd.rules ${D}/${sysconfdir}/udev/rules.d - install -d ${D}${base_libdir}/udev/ - install -m 0755 ${S}/gpsd.hotplug ${D}${base_libdir}/udev/ - - #support for python - install -d ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - install -m 755 ${S}/gps/*.py ${D}/${PYTHON_SITEPACKAGES_DIR}/gps - - #support for systemd - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_unitdir}/system/${BPN}.service - install -m 0644 ${S}/systemd/${BPN}.socket ${D}${systemd_unitdir}/system/${BPN}.socket - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps - - # New ubxtool - install -m 0755 ${S}/ubxtool ${D}/${bindir} - install -m 0644 ${S}/ubxtool.1 ${D}/${mandir}/man1 -} - -RDEPENDS_${PN}-conf += "bash" - -pkg_postinst_${PN}-conf() { - update-alternatives --install ${sysconfdir}/default/gpsd gpsd-defaults ${sysconfdir}/default/gpsd.default 10 -} - -pkg_postrm_${PN}-conf() { - update-alternatives --remove gpsd-defaults ${sysconfdir}/default/gpsd.default -} - -PACKAGES =+ "libgps libgpsd python-pygps-dbg python-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpspipe gps-utils" - -# File does not exist: ${libdir}/libQgpsmm.prl -FILES_${PN}-dev += "${libdir}/pkgconfdir/libgpsd.pc ${libdir}/pkgconfdir/libgps.pc \ - ${libdir}/libQgpsmm.prl \ - ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps" - -FILES_${PN} += "${sbindir}/gpsd_*" - -FILES_python-pygps-dbg += " ${libdir}/python*/site-packages/gps/.debug" - -RDEPENDS_${PN} = "gpsd-gpsctl bash" - -# gpsd-udev is for USB, which we are not using -RRECOMMENDS_${PN} = "gpsd-conf gpsd-machine-conf" - -SUMMARY_${PN}-udev = "udev relevant files to use gpsd hotplugging" -FILES_${PN}-udev = "${base_libdir}/udev ${sysconfdir}/udev/*" -RDEPENDS_${PN}-udev += "eudev gpsd-conf" - -SUMMARY_libgpsd = "C service library used for communicating with gpsd" -FILES_libgpsd = "${libdir}/libgpsd.so.*" - -SUMMARY_libgps = "C service library used for communicating with gpsd" -FILES_libgps = "${libdir}/libgps.so.*" - -SUMMARY_${PN}-conf = "gpsd configuration files and init scripts" -FILES_${PN}-conf = "${sysconfdir}" -CONFFILES_${PN}-conf = "${sysconfdir}/default/gpsd.default" - -SUMMARY_${PN}-gpsctl = "Tool for tweaking GPS modes" -FILES_${PN}-gpsctl = "${bindir}/gpsctl" - -SUMMARY_gpspipe = "Tool to connectg to gpsd and retrieve sentences" -FILES_gpspipe = "${bindir}/gpspipe" - -SUMMARY_gps-utils = "Utils used for simulating, monitoring,... a GPS" -FILES_gps-utils = "${bindir}/*" -RDEPENDS_gps-utils = "python-pygps" - -SUMMARY_python-pygps = "Python bindings to gpsd" -FILES_python-pygps = "${PYTHON_SITEPACKAGES_DIR}/*" -RDEPENDS_python-pygps = " \ - python-core \ - python-io \ - python-threading \ - python-terminal \ - python-curses \ - gpsd \ - python-json" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "${BPN}.socket ${BPN}ctl@.service" - - -ALTERNATIVE_${PN} = "gpsd-defaults" -ALTERNATIVE_LINK_NAME[gpsd-defaults] = "${sysconfdir}/default/gpsd" -ALTERNATIVE_TARGET[gpsd-defaults] = "${sysconfdir}/default/gpsd.default" diff --git a/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh b/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh deleted file mode 100755 index aeedf67..0000000 --- a/recipes-navigation/gpsd/gpsdupdater/bin/bldgpsd.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash -# This program creates an installer bash script. -# To install you execute: -# bash gpsdipk.sh -# Files needed -# ~/lib/opkginstall.sh -# ~/lib/bashinstaller.sh -# -function usage -{ - echo 'bldgpsd [mlinuxdir]' 2>&1 - exit -} -function cleanup -{ - if [[ $tmpdir =~ ^/var/tmp/gpsdbld ]] ; then - rm -rf $tmpdir - fi -} -if (($# != 1)) ; then - usage -fi -trap cleanup exit -mlpath="$1" - - -fullpath=$(readlink ${mlpath}) -tmpdirtemplate=/var/tmp/gpsdbld.XXXXX -tmpdir=$(mktemp -d $tmpdirtemplate) -FLIST=\ -" -libpanelw5_*_arm926ejste.ipk -python-curses_*_arm926ejste.ipk -python-json_*_arm926ejste.ipk -libgps22_0*_arm926ejste.ipk -gpsd_*_arm926ejste.ipk -gpsd-conf_*_arm926ejste.ipk -gpsd-gpsctl_*_arm926ejste.ipk -gpsd-udev_*_arm926ejste.ipk -gps-utils_*_arm926ejste.ipk -python-pygps_*_arm926ejste.ipk -ntp_*_arm926ejste.ipk -ntp-utils_*_arm926ejste.ipk -ntp-tickadj_*_arm926ejste.ipk -busybox_*_arm926ejste.ipk -" -armpath=${mlpath}/build/tmp/deploy/ipk/arm926ejste -if ! [[ -d $armpath ]] ; then - echo $armpath does not exist. No files to save - exit 1 -fi -mkdir ${tmpdir}/packages -cp ~/lib/bashinstaller.sh $tmpdir/packages/gpsdipk.sh - -echo directory is $armpath -echo list is $FLIST -chmod +x ~/lib/bashinstaller.sh -(cd $armpath; cp ~/lib/opkginstall.sh . ; echo opkginstall.sh $FLIST | tr ' ' '\n' | cpio -ov -Hcrc >>${tmpdir}/packages/gpsdipk.sh ; rm opkginstall.sh) -mv ${tmpdir}/packages/gpsdipk.sh /var/tmp -echo installer is /var/tmp/gpsdipk.sh - diff --git a/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh b/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh deleted file mode 100755 index 8b04288..0000000 --- a/recipes-navigation/gpsd/gpsdupdater/lib/bashinstaller.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -echo "" -echo "Self Extracting Installer" -echo "" - -export TMPDIR=`mktemp -d /tmp/selfextract.XXXXXX` - -ARCHIVE=`awk '/^__ARCHIVE_BELOW__/ {print NR + 1; exit 0; }' $0` - -tail -n+$ARCHIVE $0 | (cd $TMPDIR; pwd; ls; cpio -ivdum) - -CDIR=`pwd` -cd $TMPDIR -./opkginstall.sh - -cd $CDIR - -#rm -rf $TMPDIR - -exit 0 - -__ARCHIVE_BELOW__ diff --git a/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh b/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh deleted file mode 100755 index d1c17ba..0000000 --- a/recipes-navigation/gpsd/gpsdupdater/lib/opkginstall.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -list="" -for f in *.ipk ; do - if [[ $f =~ ^busybox ]] ; then - continue - fi - [[ $f =~ ([^_]*) ]] && true - list+="${BASH_REMATCH[1]} " -done -list=$(echo $list | xargs) -echo $list -set -x -opkg --force-depends --force-remove --force-removal-of-dependent-packages remove $list -opkg install *.ipk -set +x diff --git a/recipes-navigation/gpsd/libgps24_3.18.1.bb b/recipes-navigation/gpsd/libgps24_3.18.1.bb deleted file mode 100644 index 8f1b811..0000000 --- a/recipes-navigation/gpsd/libgps24_3.18.1.bb +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "${PN} ${PN}-dbg ${PN}-dev" -PR="m5" -#BPN="gpsd" -#BP="${BPN}-${PV}" - -EXTRANATIVEPATH += "chrpath-native" -FILESEXTRAPATHS_prepend = "${THISDIR}/gpsd-${PV}:" -# sysclockcrash is fixed for gpsd -# suppress text in binary is fixed for gpsctl - -S = "${WORKDIR}/gpsd-${PV}" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/gpsd/gpsd-${PV}.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://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ -" -SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" -SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" - -inherit scons python-dir pythonnative systemd - -SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" - -export STAGING_INCDIR -export STAGING_LIBDIR - -# Necessary for python -export BUILD_SYS -export HOST_SYS - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}" -PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='true' \ - strip='false' \ - chrpath='yes' \ - systemd='${SYSTEMD_OESCONS}' \ - ashtech='no' \ - earthmate='no' \ - evermore='no' \ - fury='no' \ - fv18='no' \ - garmin='no' \ - garmintxt='no' \ - geostar='no' \ - greis='no' \ - itrax='no' \ - mtk3301='no' \ - navcom='no' \ - nmea0183='yes' \ - nmea2000='no' \ - oncore='no' \ - sirf='no' \ - skytraq='no' \ - superstar2='no' \ - tnt='no' \ - tripmate='no' \ - tsip='no' \ - ublox='yes' \ - ubloxtimels='yes' \ - aivdm='no' \ - gpsclock='no' \ - oceanserver='no' \ - libdir='${libdir}' \ - fixed_stop_bits='1' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - prefix='usr' \ - ${PACKAGECONFIG_CONFARGS} \ -" -# this cannot be used, because then chrpath is not found and only static lib is built -# target=${HOST_SYS} - -do_compile_prepend() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" -} -do_install() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" - - export DESTDIR="${D}" - install -d 755 ${D}${libdir} - install libgps.so.24.* ${D}${libdir} - cp -a libgps.so.24 ${D}${libdir} - (cd ${D}${libdir};ln -sf libgps.so.24.* libgps.so) - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps - install -m 0644 ${S}/gps.h ${D}/${includedir} - install -m 0644 ${S}/libgpsmm.h ${D}/${includedir} -} - - -FILES_${PN}-dev_append = " ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps ${libdir}/libgps.so" -FILES_${PN}-dev_remove = "${includedir} ${FILES_SOLIBSDEV} \ - ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig \ - ${datadir}/pkgconfig ${datadir}/aclocal \ - ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la" - -SUMMARY_${PN}-dbg = "Debug the C service library used for communicating with gpsd" -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev" - -FILES_${PN}-dbg_replace = "${prefix}/src/* ${libdir}/.debug/*" - -SUMMARY_${PN} = "C service library used for communicating with gpsd" - -RDEPENDS_${PN} += "dbus-lib" - -FILES_${PN}_append = " ${libdir}/libgps.so.* " -FILES_${PN}_remove = "${bindir}/* ${sbindir}/* ${libexecdir}/* \ - ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir} \ - ${localstatedir} ${base_bindir}/* ${base_sbindir}/* \ - ${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev \ - ${prefix}/lib/udev ${base_libdir}/udev ${libdir}/udev \ - ${datadir}/${BPN} ${libdir}/${BPN}/* ${datadir}/pixmaps \ - ${datadir}/applications ${datadir}/idl ${datadir}/omf \ - ${datadir}/sounds ${libdir}/bonobo/servers \ -" diff --git a/recipes-navigation/gpsd/libgps24_3.18.1.bb.old b/recipes-navigation/gpsd/libgps24_3.18.1.bb.old deleted file mode 100644 index 8f1b811..0000000 --- a/recipes-navigation/gpsd/libgps24_3.18.1.bb.old +++ /dev/null @@ -1,142 +0,0 @@ -SUMMARY = "A TCP/IP Daemon simplifying the communication with GPS devices" -SECTION = "console/network" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800" -DEPENDS = "dbus dbus-glib ncurses python libusb1 chrpath-replacement-native pps-tools" -PROVIDES = "${PN} ${PN}-dbg ${PN}-dev" -PR="m5" -#BPN="gpsd" -#BP="${BPN}-${PV}" - -EXTRANATIVEPATH += "chrpath-native" -FILESEXTRAPATHS_prepend = "${THISDIR}/gpsd-${PV}:" -# sysclockcrash is fixed for gpsd -# suppress text in binary is fixed for gpsctl - -S = "${WORKDIR}/gpsd-${PV}" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/gpsd/gpsd-${PV}.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://0006-ubxtimelps.patch \ - file://0006-itu_r_tf_460_6.patch \ -" -SRC_URI[md5sum] = "3b11f26b295010666b1767b308f90bc5" -SRC_URI[sha256sum] = "5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e" - -inherit scons python-dir pythonnative systemd - -SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" - -export STAGING_INCDIR -export STAGING_LIBDIR - -# Necessary for python -export BUILD_SYS -export HOST_SYS - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" -PACKAGECONFIG[bluez] = "bluez='false',${BLUEZ}" -PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" -EXTRA_OESCONS = " \ - sysroot=${STAGING_DIR_TARGET} \ - libQgpsmm='false' \ - debug='true' \ - strip='false' \ - chrpath='yes' \ - systemd='${SYSTEMD_OESCONS}' \ - ashtech='no' \ - earthmate='no' \ - evermore='no' \ - fury='no' \ - fv18='no' \ - garmin='no' \ - garmintxt='no' \ - geostar='no' \ - greis='no' \ - itrax='no' \ - mtk3301='no' \ - navcom='no' \ - nmea0183='yes' \ - nmea2000='no' \ - oncore='no' \ - sirf='no' \ - skytraq='no' \ - superstar2='no' \ - tnt='no' \ - tripmate='no' \ - tsip='no' \ - ublox='yes' \ - ubloxtimels='yes' \ - aivdm='no' \ - gpsclock='no' \ - oceanserver='no' \ - libdir='${libdir}' \ - fixed_stop_bits='1' \ - pps='yes' \ - gpsd_group='gps' \ - ntpshm='yes' \ - prefix='usr' \ - ${PACKAGECONFIG_CONFARGS} \ -" -# this cannot be used, because then chrpath is not found and only static lib is built -# target=${HOST_SYS} - -do_compile_prepend() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" -} -do_install() { - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}" - export PKG_CONFIG="PKG_CONFIG_SYSROOT_DIR=\"${PKG_CONFIG_SYSROOT_DIR}\" pkg-config" - export STAGING_PREFIX="${STAGING_DIR_HOST}/${prefix}" - export LINKFLAGS="${LDFLAGS}" - - export DESTDIR="${D}" - install -d 755 ${D}${libdir} - install libgps.so.24.* ${D}${libdir} - cp -a libgps.so.24 ${D}${libdir} - (cd ${D}${libdir};ln -sf libgps.so.24.* libgps.so) - - # support for dev (development) - mkdir -p -m 0644 ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd.h ${D}/${includedir}/gps - install -m 0644 ${S}/os_compat.h ${D}/${includedir}/gps - install -m 0644 ${S}/revision.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsdclient.h ${D}/${includedir}/gps - install -m 0644 ${S}/gpsd_config.h ${D}/${includedir}/gps - install -m 0644 ${S}/compiler.h ${D}/${includedir}/gps - install -m 0644 ${S}/ppsthread.h ${D}/${includedir}/gps - install -m 0644 ${S}/gps.h ${D}/${includedir} - install -m 0644 ${S}/libgpsmm.h ${D}/${includedir} -} - - -FILES_${PN}-dev_append = " ${includedir}/gps.h ${includedir}/libgpsmm.h ${includedir}/gps ${libdir}/libgps.so" -FILES_${PN}-dev_remove = "${includedir} ${FILES_SOLIBSDEV} \ - ${libdir}/*.la ${libdir}/*.o ${libdir}/pkgconfig \ - ${datadir}/pkgconfig ${datadir}/aclocal \ - ${base_libdir}/*.o ${libdir}/${BPN}/*.la ${base_libdir}/*.la" - -SUMMARY_${PN}-dbg = "Debug the C service library used for communicating with gpsd" -PACKAGES = "${PN} ${PN}-dbg ${PN}-dev" - -FILES_${PN}-dbg_replace = "${prefix}/src/* ${libdir}/.debug/*" - -SUMMARY_${PN} = "C service library used for communicating with gpsd" - -RDEPENDS_${PN} += "dbus-lib" - -FILES_${PN}_append = " ${libdir}/libgps.so.* " -FILES_${PN}_remove = "${bindir}/* ${sbindir}/* ${libexecdir}/* \ - ${libdir}/lib*${SOLIBS} ${sysconfdir} ${sharedstatedir} \ - ${localstatedir} ${base_bindir}/* ${base_sbindir}/* \ - ${base_libdir}/*${SOLIBS} ${base_prefix}/lib/udev \ - ${prefix}/lib/udev ${base_libdir}/udev ${libdir}/udev \ - ${datadir}/${BPN} ${libdir}/${BPN}/* ${datadir}/pixmaps \ - ${datadir}/applications ${datadir}/idl ${datadir}/omf \ - ${datadir}/sounds ${libdir}/bonobo/servers \ -" |