Mail archive
alpine-devel

[alpine-devel] [PATCH] main/gpsd: add support for pps

From: Nathan Angelacos <nangel_at_alpinelinux.org>
Date: Wed, 18 Dec 2013 15:23:54 +0000

Include local timepps.h header so gpsd uses pps_ldisc kernel module
Install .so.* symlinks as symlinks and not full copies of target
---
 main/gpsd/APKBUILD                            |  23 ++-
 main/gpsd/gpsd-use-local-timepps-header.patch |  11 ++
 main/gpsd/timepps.h                           | 216 ++++++++++++++++++++++++++
 3 files changed, 248 insertions(+), 2 deletions(-)
 create mode 100644 main/gpsd/gpsd-use-local-timepps-header.patch
 create mode 100644 main/gpsd/timepps.h
diff --git a/main/gpsd/APKBUILD b/main/gpsd/APKBUILD
index 0046eb9..691a6a2 100644
--- a/main/gpsd/APKBUILD
+++ b/main/gpsd/APKBUILD
_at_@ -2,7 +2,7 @@
 # Maintainer: Nathan Angelacos <nangel_at_alpinelinux.org>
 pkgname=gpsd
 pkgver=3.9
-pkgrel=0
+pkgrel=1
 pkgdesc="A GPS daemon"
 arch=all
 url="http://catb.org/gpsd/"
_at_@ -12,6 +12,8 @@ makedepends="scons python-dev libcap-dev"
 install=
 # subpackages="$pkgname-doc $pkgname-dev"
 source="http://download-mirror.savannah.gnu.org/releases/gpsd/$pkgname-$pkgver.tar.gz
+	gpsd-use-local-timepps-header.patch
+	timepps.h
 	gpsd.initd
 	gpsd.confd"
 
_at_@ -19,17 +21,28 @@ _builddir="$srcdir"/$pkgname-$pkgver
 
 prepare() {
 	local i
+
+    # We copy timepps.h to the local build directory instead of 
+    # creating a pps-tools-dev package for ppstime.h
+    # (See https://github.com/ago/pps-tools)
+    mkdir "$_builddir"/sys
+    cp timepps.h "$_builddir"/sys/
+
+
 	cd "$_builddir"
 	for i in $source; do
 		case $i in
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+
 }
 
 build() {
 	cd "$_builddir"
+	CPPSFLAGS="$CPPSFLAGS -I."
 	export CPPFLAGS=\"$CPPFLAGS\"
+	echo $CPPFLAGS
 	scons -j${JOBS:-2} \
 		prefix=/usr \
 		|| return 1
_at_@ -39,7 +52,7 @@ package() {
     cd "$_builddir"
 
     mkdir -p "$pkgdir"/usr/lib
-    cp "$_builddir"/libgps*.so* "$pkgdir"/usr/lib/
+    cp -a "$_builddir"/libgps*.so* "$pkgdir"/usr/lib/
 
     mkdir -p "$pkgdir"/usr/sbin
     for a in gpsdecode gpsd gpsctl gpsdctl gpspipe; do
_at_@ -51,11 +64,17 @@ package() {
 }
 
 md5sums="53a88f24a0973d23427e82e9a8914f19  gpsd-3.9.tar.gz
+2cfc595c7cbd979970f8a0dae0b7d982  gpsd-use-local-timepps-header.patch
+28f6835098a216f4a620f9218d15b5b8  timepps.h
 ac2c2a034c15df16c28c755d47d3dd74  gpsd.initd
 453f3d1d75d2b048f0987cfb9cf250fd  gpsd.confd"
 sha256sums="d9b24be838b48db5e8eba66f74edf32d1982fe0fb018c9d9a7ad1ada9f189d5a  gpsd-3.9.tar.gz
+d9c9393f46ca0fa17bc37cf309092e3afef0b6008de411f08a30405e9c7b9931  gpsd-use-local-timepps-header.patch
+ab4f459ee9d1037d7fa962a66ea652b08935539a4f443dc216e82b5717d8bb22  timepps.h
 21efede3e94ef5795ea4b1998c8b165d757953b77480c42381794c27d8a6626e  gpsd.initd
 218a7f044f902070922c45f3b543c9ff6af25be5305648899565c1fbdc0d5da9  gpsd.confd"
 sha512sums="082524a7744da5212074123ab7920fe77bfa35f99cb12a900ad7b2718ea563803f988d09d7a063d08784d790c8c7e65503daefce4e6dd6bd1bc77bf580db638f  gpsd-3.9.tar.gz
+3fb7d91cb5f00ce52e3ccc6f3c56375410c4257c0be3be6e2253c6ed0c27d49fd0408008379925e96348027b59404e089cb7f64212221e1c950fdf5302044c41  gpsd-use-local-timepps-header.patch
+eb11fc19243d1789016d88eb7645bfe67c46304547781489bf36eb1dd4c252d523681ff835a6488fa0ef62b6b9e2f781c672279f4439f5d5640a3f214a113048  timepps.h
 680b891375bb4896cb210ae04a08e1f38cc2127346dbb2942cb61045100adf3ca76909e63e239e840f7676c9869fe1ca19219e2197af6e6ba1354e2ce825001c  gpsd.initd
 55d4a51f82d445d3ac93b2855132ef4380908ed045feba6298ed1d0b607cd9054b5325c024dc52b370983ebd5d9b377537aee7d7128c97aa22e3075f4134d404  gpsd.confd"
diff --git a/main/gpsd/gpsd-use-local-timepps-header.patch b/main/gpsd/gpsd-use-local-timepps-header.patch
new file mode 100644
index 0000000..46bd300
--- /dev/null
+++ b/main/gpsd/gpsd-use-local-timepps-header.patch
_at_@ -0,0 +1,11 @@
+--- a/gpsd.h-tail
++++ b/gpsd.h-tail
+_at_@ -19,7 +19,7 @@
+ // include unistd.h here as it is missing on older pps-tools releases.
+ // 'close' is not defined otherwise.
+ #include <unistd.h>
+-#include <sys/timepps.h>
++#include "sys/timepps.h"
+ #endif
+ 
+ #ifdef _WIN32
diff --git a/main/gpsd/timepps.h b/main/gpsd/timepps.h
new file mode 100644
index 0000000..8c3bd83
--- /dev/null
+++ b/main/gpsd/timepps.h
_at_@ -0,0 +1,216 @@
+/*
+ * timepps.h -- PPS API main header
+ *
+ * Copyright (C) 2005-2007   Rodolfo Giometti <giometti_at_linux.it>
+ * Copyright (C) 2009-2011   Alexander Gordeev <alex_at_gordick.net>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ * Source: https://github.com/ago/pps-tools/ - Retreived Dec 2013
+ */
+
+#ifndef _SYS_TIMEPPS_H_
+#define _SYS_TIMEPPS_H_
+
+#include <errno.h>
+#include <sys/time.h>
+#include <sys/ioctl.h>
+#include <linux/types.h>
+#include <linux/pps.h>
+
+#define LINUXPPS	1		/* signal we are using LinuxPPS */
+
+/*
+ * New data structures
+ */
+
+struct ntp_fp {
+	unsigned int integral;
+	unsigned int fractional;
+};
+
+union pps_timeu {
+	struct timespec tspec;
+	struct ntp_fp ntpfp;
+	unsigned long longpad[3];
+};
+
+struct pps_info {
+	unsigned long assert_sequence;	/* seq. num. of assert event */
+	unsigned long clear_sequence;	/* seq. num. of clear event */
+	union pps_timeu assert_tu;	/* time of assert event */
+	union pps_timeu clear_tu;	/* time of clear event */
+	int current_mode;		/* current mode bits */
+};
+
+struct pps_params {
+	int api_version;		/* API version # */
+	int mode;			/* mode bits */
+	union pps_timeu assert_off_tu;	/* offset compensation for assert */
+	union pps_timeu clear_off_tu;	/* offset compensation for clear */
+};
+
+typedef int pps_handle_t;		/* represents a PPS source */
+typedef unsigned long pps_seq_t;	/* sequence number */
+typedef struct ntp_fp ntp_fp_t;		/* NTP-compatible time stamp */
+typedef union pps_timeu pps_timeu_t;	/* generic data type for time stamps */
+typedef struct pps_info pps_info_t;
+typedef struct pps_params pps_params_t;
+
+#define assert_timestamp        assert_tu.tspec
+#define clear_timestamp         clear_tu.tspec
+
+#define assert_timestamp_ntpfp  assert_tu.ntpfp
+#define clear_timestamp_ntpfp   clear_tu.ntpfp
+
+#define assert_offset		assert_off_tu.tspec
+#define clear_offset		clear_off_tu.tspec
+
+#define assert_offset_ntpfp     assert_off_tu.ntpfp
+#define clear_offset_ntpfp      clear_off_tu.ntpfp
+
+/*
+ * The PPS API
+ */
+
+static __inline int time_pps_create(int source, pps_handle_t *handle)
+{
+	int ret;
+	struct pps_kparams dummy;
+
+	if (!handle) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	/* First we check if current device is a valid PPS one by
+	 * doing a dummy PPS_GETPARAMS...
+	 */
+	ret = ioctl(source, PPS_GETPARAMS, &dummy);
+	if (ret) {
+		errno = EOPNOTSUPP;
+		return -1;
+	}
+
+	/* ... then since in LinuxPPS there are no differences between a
+	 * "PPS source" and a "PPS handle", we simply return the same value.
+	 */
+	*handle = source;
+
+	return 0;
+}
+
+static __inline int time_pps_destroy(pps_handle_t handle)
+{
+	return close(handle);
+}
+
+static __inline int time_pps_getparams(pps_handle_t handle,
+					pps_params_t *ppsparams)
+{
+	int ret;
+	struct pps_kparams __ppsparams;
+
+	ret = ioctl(handle, PPS_GETPARAMS, &__ppsparams);
+
+	ppsparams->api_version = __ppsparams.api_version;
+	ppsparams->mode = __ppsparams.mode;
+	ppsparams->assert_off_tu.tspec.tv_sec = __ppsparams.assert_off_tu.sec;
+	ppsparams->assert_off_tu.tspec.tv_nsec = __ppsparams.assert_off_tu.nsec;
+	ppsparams->clear_off_tu.tspec.tv_sec = __ppsparams.clear_off_tu.sec;
+	ppsparams->clear_off_tu.tspec.tv_nsec = __ppsparams.clear_off_tu.nsec;
+
+	return ret;
+}
+
+static __inline int time_pps_setparams(pps_handle_t handle,
+					const pps_params_t *ppsparams)
+{
+	struct pps_kparams __ppsparams;
+
+	__ppsparams.api_version = ppsparams->api_version;
+	__ppsparams.mode = ppsparams->mode;
+	__ppsparams.assert_off_tu.sec = ppsparams->assert_off_tu.tspec.tv_sec;
+	__ppsparams.assert_off_tu.nsec = ppsparams->assert_off_tu.tspec.tv_nsec;
+	__ppsparams.clear_off_tu.sec = ppsparams->clear_off_tu.tspec.tv_sec;
+	__ppsparams.clear_off_tu.nsec = ppsparams->clear_off_tu.tspec.tv_nsec;
+
+	return ioctl(handle, PPS_SETPARAMS, &__ppsparams);
+}
+
+/* Get capabilities for handle */
+static __inline int time_pps_getcap(pps_handle_t handle, int *mode)
+{
+	return ioctl(handle, PPS_GETCAP, mode);
+}
+
+static __inline int time_pps_fetch(pps_handle_t handle, const int tsformat,
+					pps_info_t *ppsinfobuf,
+					const struct timespec *timeout)
+{
+	struct pps_fdata __fdata;
+	int ret;
+
+	/* Sanity checks */
+	if (tsformat != PPS_TSFMT_TSPEC) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if (timeout) {
+		__fdata.timeout.sec = timeout->tv_sec;
+		__fdata.timeout.nsec = timeout->tv_nsec;
+		__fdata.timeout.flags = ~PPS_TIME_INVALID;
+	} else
+		__fdata.timeout.flags = PPS_TIME_INVALID;
+
+	ret = ioctl(handle, PPS_FETCH, &__fdata);
+
+	ppsinfobuf->assert_sequence = __fdata.info.assert_sequence;
+	ppsinfobuf->clear_sequence = __fdata.info.clear_sequence;
+	ppsinfobuf->assert_tu.tspec.tv_sec = __fdata.info.assert_tu.sec;
+	ppsinfobuf->assert_tu.tspec.tv_nsec = __fdata.info.assert_tu.nsec;
+	ppsinfobuf->clear_tu.tspec.tv_sec = __fdata.info.clear_tu.sec;
+	ppsinfobuf->clear_tu.tspec.tv_nsec = __fdata.info.clear_tu.nsec;
+	ppsinfobuf->current_mode = __fdata.info.current_mode;
+
+	return ret;
+}
+
+#ifdef PPS_KC_BIND
+
+static __inline int time_pps_kcbind(pps_handle_t handle,
+					const int kernel_consumer,
+					const int edge, const int tsformat)
+{
+	struct pps_bind_args __bind_args;
+
+	__bind_args.tsformat = tsformat;
+	__bind_args.edge = edge;
+	__bind_args.consumer = kernel_consumer;
+
+	return ioctl(handle, PPS_KC_BIND, &__bind_args);
+}
+
+#else /* !PPS_KC_BIND */
+
+static __inline int time_pps_kcbind(pps_handle_t handle,
+					const int kernel_consumer,
+					const int edge, const int tsformat)
+{
+	/* LinuxPPS doesn't implement kernel consumer feature */
+	errno = EOPNOTSUPP;
+	return -1;
+}
+
+#endif /* PPS_KC_BIND */
+
+#endif /* _SYS_TIMEPPS_H_ */
-- 
1.8.2.3
---
Unsubscribe:  alpine-devel+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Wed Dec 18 2013 - 15:23:54 UTC