[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-150-g528d1116d
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2019-12-05 14:51:43
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 528d1116db44788c2493d6718de750032c2f6091 (commit)
from 1b147623a61a62c805148ee22844021d6c60abd8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 528d1116db44788c2493d6718de750032c2f6091
Author: Julien BOIBESSOT <jul...@ar...>
Date: Thu Dec 5 15:50:29 2019 +0100
[BUILDROOT] 2019.02: bump gpsd to 3.19 (to better support u-blox M8 modules)
-----------------------------------------------------------------------
Summary of changes:
...mainline-package-gpsd-bump-version-to-3.9.patch | 97 ++++++++++++++++++++++
patches/buildroot/2019.02/cleanup_buildroot.sh | 2 +
2 files changed, 99 insertions(+)
create mode 100644 patches/buildroot/2019.02/045-mainline-package-gpsd-bump-version-to-3.9.patch
diff --git a/patches/buildroot/2019.02/045-mainline-package-gpsd-bump-version-to-3.9.patch b/patches/buildroot/2019.02/045-mainline-package-gpsd-bump-version-to-3.9.patch
new file mode 100644
index 000000000..dfa0db368
--- /dev/null
+++ b/patches/buildroot/2019.02/045-mainline-package-gpsd-bump-version-to-3.9.patch
@@ -0,0 +1,97 @@
+Backport of BR mainline.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch
+===================================================================
+--- buildroot.orig/package/gpsd/0002-driver_greis-fix-build-with-reconfigure-disabled.patch 2019-11-10 22:40:03.000000000 +0100
++++ /dev/null 1970-01-01 00:00:00.000000000 +0000
+@@ -1,49 +0,0 @@
+-From 21a752e827bc9e14de4b4c26aef4d0db7403a5b7 Mon Sep 17 00:00:00 2001
+-From: Baruch Siach <ba...@tk...>
+-Date: Tue, 9 Oct 2018 15:22:46 +0300
+-Subject: [PATCH] driver_greis: fix build with reconfigure disabled
+-
+-Unhide the definition of greis_parse_input and greis_event_hook since
+-they are used unconditionally.
+-
+-Fixes the following build failure:
+-
+-driver_greis.c:969:25: error: 'greis_parse_input' undeclared here (not in a function); did you mean 'generic_parse_input'?
+- .parse_packet = greis_parse_input,
+- ^~~~~~~~~~~~~~~~~
+- generic_parse_input
+-driver_greis.c:973:25: error: 'greis_event_hook' undeclared here (not in a function)
+- .event_hook = greis_event_hook,
+- ^~~~~~~~~~~~~~~~
+-
+-Cc: Gregory Fong <gre...@vi...>
+-Signed-off-by: Baruch Siach <ba...@tk...>
+----
+-Upstream status: http://lists.nongnu.org/archive/html/gpsd-dev/2018-10/msg00012.html
+-
+- driver_greis.c | 2 +-
+- 1 file changed, 1 insertion(+), 1 deletion(-)
+-
+-diff --git a/driver_greis.c b/driver_greis.c
+-index 9eb148fc76cd..222bd9daf020 100644
+---- a/driver_greis.c
+-+++ b/driver_greis.c
+-@@ -797,7 +797,6 @@ static ssize_t greis_control_send(struct gps_device_t *session,
+- }
+- #endif /* CONTROLSEND_ENABLE */
+-
+--#ifdef RECONFIGURE_ENABLE
+- static void greis_event_hook(struct gps_device_t *session, event_t event)
+- {
+- if (session->context->readonly)
+-@@ -870,6 +869,7 @@ static gps_mask_t greis_parse_input(struct gps_device_t *session)
+- return 0;
+- }
+-
+-+#ifdef RECONFIGURE_ENABLE
+- /**
+- * Set port operating mode, speed, parity, stopbits etc. here.
+- * Note: parity is passed as 'N'/'E'/'O', but you should program
+---
+-2.19.1
+-
+Index: buildroot/package/gpsd/Config.in
+===================================================================
+--- buildroot.orig/package/gpsd/Config.in 2019-12-05 14:46:41.674989643 +0100
++++ buildroot/package/gpsd/Config.in 2019-12-05 14:51:48.662652887 +0100
+@@ -18,7 +18,7 @@
+
+ The D-Bus interface is included if dbus-glib is enabled.
+
+- http://www.catb.org/gpsd/
++ https://gpsd.gitlab.io/gpsd
+
+ if BR2_PACKAGE_GPSD
+
+Index: buildroot/package/gpsd/gpsd.hash
+===================================================================
+--- buildroot.orig/package/gpsd/gpsd.hash 2019-11-10 22:40:03.000000000 +0100
++++ buildroot/package/gpsd/gpsd.hash 2019-12-05 14:52:30.117848446 +0100
+@@ -1,3 +1,3 @@
+ # Locally calculated
+-sha256 48521f5158f5fda4c88a6f75e8bfc1ee67e999e3fc095e4a06cb8c2af56712f4 gpsd-3.18.tar.gz
+-sha256 71ff85d18bf063954cfc4251678d0e772223e21f80febbd99d5524c90f73f832 COPYING
++sha256 27dd24d45b2ac69baab7933da2bf6ae5fb0be90130f67e753c110a3477155f39 gpsd-3.19.tar.gz
++sha256 13ba6fe5b2f41f03b854f9ac5f271e116d5ed55890cc20f5fe44dcfa0dc5958b COPYING
+Index: buildroot/package/gpsd/gpsd.mk
+===================================================================
+--- buildroot.orig/package/gpsd/gpsd.mk 2019-12-05 14:46:41.674989643 +0100
++++ buildroot/package/gpsd/gpsd.mk 2019-12-05 14:51:00.850967132 +0100
+@@ -4,9 +4,9 @@
+ #
+ ################################################################################
+
+-GPSD_VERSION = 3.18
++GPSD_VERSION = 3.19
+ GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
+-GPSD_LICENSE = BSD-3-Clause
++GPSD_LICENSE = BSD-2-Clause
+ GPSD_LICENSE_FILES = COPYING
+ GPSD_INSTALL_STAGING = YES
+
diff --git a/patches/buildroot/2019.02/cleanup_buildroot.sh b/patches/buildroot/2019.02/cleanup_buildroot.sh
index dd8e47d6c..c9d6ba6ce 100755
--- a/patches/buildroot/2019.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2019.02/cleanup_buildroot.sh
@@ -50,6 +50,8 @@ rm -rf buildroot/package/gnuboy/gnuboy.mk
rm -rf buildroot/package/gpsd/Config.in
rm -rf buildroot/package/gpsd/S50gpsd
rm -rf buildroot/package/gpsd/gpsd.mk
+rm -rf buildroot/package/gpsd/gpsd.hash
+rm -rf buildroot/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch
rm -rf buildroot/package/gsmmux/Config.in
rm -rf buildroot/package/gsmmux/gsmmux.mk
rm -rf buildroot/package/imx-test/10.11.01/imx-test-01_fixes.patch
hooks/post-receive
--
armadeus
|