* [Buildroot] [PATCH 1/1] collectd: fix build with gpsd 3.18
@ 2018-10-09 17:14 Fabrice Fontaine
2018-10-09 19:40 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2018-10-09 17:14 UTC (permalink / raw)
To: buildroot
Add patch to fix call to gps_read
Fixes:
- http://autobuild.buildroot.net/results/63a4f980d7cdb4b0823840f747589803fcd0d69f
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/collectd/0002-gps-fix-gps_read.patch | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 package/collectd/0002-gps-fix-gps_read.patch
diff --git a/package/collectd/0002-gps-fix-gps_read.patch b/package/collectd/0002-gps-fix-gps_read.patch
new file mode 100644
index 0000000000..6e1dd839cd
--- /dev/null
+++ b/package/collectd/0002-gps-fix-gps_read.patch
@@ -0,0 +1,33 @@
+From 3e369c98213d248fb5821fc29033877e83bf7fe1 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 9 Oct 2018 18:55:00 +0200
+Subject: [PATCH] gps: fix gps_read
+
+gps_read now takes three arguments since version 3.18 of gpsd: see
+http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=6bba8b329fc7687b15863d30471d5af402467802
+
+Fixes:
+ - http://autobuild.buildroot.net/results/63a4f980d7cdb4b0823840f747589803fcd0d69f
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/collectd/collectd/pull/2946]
+---
+ src/gps.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gps.c b/src/gps.c
+index 1d32d049..ae3889c9 100644
+--- a/src/gps.c
++++ b/src/gps.c
+@@ -141,7 +141,7 @@ static void *cgps_thread(void *pData) {
+ continue;
+ }
+
+- if (gps_read(&gpsd_conn) == -1) {
++ if (gps_read(&gpsd_conn, NULL, 0) == -1) {
+ WARNING("gps plugin: incorrect data! (err_count: %d)", err_count);
+ err_count++;
+
+--
+2.17.1
+
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] collectd: fix build with gpsd 3.18
2018-10-09 17:14 [Buildroot] [PATCH 1/1] collectd: fix build with gpsd 3.18 Fabrice Fontaine
@ 2018-10-09 19:40 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2018-10-09 19:40 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 9 Oct 2018 19:14:36 +0200, Fabrice Fontaine wrote:
> Add patch to fix call to gps_read
>
> Fixes:
> - http://autobuild.buildroot.net/results/63a4f980d7cdb4b0823840f747589803fcd0d69f
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/collectd/0002-gps-fix-gps_read.patch | 33 ++++++++++++++++++++
> 1 file changed, 33 insertions(+)
> create mode 100644 package/collectd/0002-gps-fix-gps_read.patch
Upstream rejected the patch, and Baruch submitted another patch that
takes into account exactly the comment made by upstream. So I've marked
this one as Rejected.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-10-09 19:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-09 17:14 [Buildroot] [PATCH 1/1] collectd: fix build with gpsd 3.18 Fabrice Fontaine
2018-10-09 19:40 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.