[meta-oe][PATCH] gpsd: Add patch to fix broken ACTIVATE hook.

[meta-oe][PATCH] gpsd: Add patch to fix broken ACTIVATE hook.

[Moritz Fischer]

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>
---
 ...e-Fix-issue-with-ACTIVATE-hook-not-being-.patch | 32 ++++++++++++++++++++++
 meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb       |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch

diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch
new file mode 100644
index 0000000..ce971de
--- /dev/null
+++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch
@@ -0,0 +1,32 @@
+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.
+
+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
+
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
index 6ae2f30..646360c 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
@@ -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 \
-- 
2.4.3

Re: [meta-oe][PATCH] gpsd: Add patch to fix broken ACTIVATE hook.

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3335 bytes --]

On Thu, Jan 07, 2016 at 09:06:28AM -0800, Moritz Fischer wrote:
> This patch is already in mainline gpsd. It fixes a

Please add Upstream-Status: Backport inside the .patch file to make it
clear.

> bug where the ACTIVATE hook for a device never gets
> called.
> 
> Signed-off-by: Moritz Fischer <moritz.fischer@ettus.com>
> ---
>  ...e-Fix-issue-with-ACTIVATE-hook-not-being-.patch | 32 ++++++++++++++++++++++
>  meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb       |  1 +
>  2 files changed, 33 insertions(+)
>  create mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch
> 
> diff --git a/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch b/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch
> new file mode 100644
> index 0000000..ce971de
> --- /dev/null
> +++ b/meta-oe/recipes-navigation/gpsd/gpsd-3.14/0001-libgpsd-core-Fix-issue-with-ACTIVATE-hook-not-being-.patch
> @@ -0,0 +1,32 @@
> +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.
> +
> +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
> +
> diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
> index 6ae2f30..646360c 100644
> --- a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
> +++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
> @@ -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 \
> -- 
> 2.4.3
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]