gpsd: Add patch to fix broken ACTIVATE hook.

This patch is already in mainline gpsd. It fixes a
bug where the ACTIVATE hook for a device never gets
called.

Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Moritz Fischer
2016-01-07 12:17:34 -08:00
committed by Martin Jansa
parent dc51449c47
commit 341253bd57
2 changed files with 36 additions and 0 deletions
@@ -0,0 +1,35 @@
From 6ff099b1ba8de74df9ddeb61e3825264b96ef692 Mon Sep 17 00:00:00 2001
From: Moritz Fischer <moritz.fischer@ettus.com>
Date: Tue, 22 Dec 2015 19:38:31 -0800
Subject: [PATCH] libgpsd-core: Fix issue with ACTIVATE hook not being called.
In the current system session->mode seemed to ignore the
O_OPTIMIZE flag, leading to the ACTIVATE hook being ignored.
Another way to fix this would be to keep the session->mode
condition pull up the check for O_CONTINUE.
Upstream-Status: Backported
This patch is in upstream git
Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
---
libgpsd_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libgpsd_core.c b/libgpsd_core.c
index 31fec2a..a84e85f 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -543,7 +543,7 @@ int gpsd_open(struct gps_device_t *session)
int gpsd_activate(struct gps_device_t *session, const int mode)
/* acquire a connection to the GPS device */
{
- if (session->mode == O_OPTIMIZE)
+ if (mode == O_OPTIMIZE)
gpsd_run_device_hook(&session->context->errout,
session->gpsdata.dev.path, "ACTIVATE");
session->gpsdata.gps_fd = gpsd_open(session);
--
2.4.3
@@ -16,6 +16,7 @@ SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \
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 \
file://gpsd-default \
file://gpsd \
file://60-gpsd.rules \