Bump buildroot to 2019.02
This commit is contained in:
@@ -1,36 +0,0 @@
|
||||
From 98c8f5f4429ac3bfc09eee235fee08b9aaff8c52 Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
||||
Date: Tue, 30 Jan 2018 19:58:54 -0800
|
||||
Subject: [PATCH] Fix isync build when ublox not selected too.
|
||||
|
||||
The isync support uses the ublox driver, but if the ublox support is
|
||||
disabled while isync is enabled, the build will fail.
|
||||
|
||||
|
||||
Upstream commit:
|
||||
http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=98c8f5f4429ac3bfc09eee235fee08b9aaff8c52
|
||||
|
||||
Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
|
||||
---
|
||||
SConstruct | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 1c1a215..c6a309e 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -334,6 +334,11 @@ for driver in ('ashtech',
|
||||
env['nmea0183'] = True
|
||||
break
|
||||
|
||||
+
|
||||
+# iSync uses ublox underneath, so we force to enable it
|
||||
+if env['isync']:
|
||||
+ env['ublox'] = True
|
||||
+
|
||||
opts.Save('.scons-option-cache', env)
|
||||
env.SConsignFile(".sconsign.dblite")
|
||||
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From 21a752e827bc9e14de4b4c26aef4d0db7403a5b7 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
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 <gregory.fong@virginorbit.com>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
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
|
||||
|
||||
@@ -154,6 +154,11 @@ config BR2_PACKAGE_GPSD_GPSCLOCK
|
||||
help
|
||||
GPSClock support
|
||||
|
||||
config BR2_PACKAGE_GPSD_GREIS
|
||||
bool "Greis"
|
||||
help
|
||||
Greis support
|
||||
|
||||
config BR2_PACKAGE_GPSD_ISYNC
|
||||
bool "iSync"
|
||||
help
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a gpsd-3.17.tar.gz
|
||||
sha256 48521f5158f5fda4c88a6f75e8bfc1ee67e999e3fc095e4a06cb8c2af56712f4 gpsd-3.18.tar.gz
|
||||
sha256 71ff85d18bf063954cfc4251678d0e772223e21f80febbd99d5524c90f73f832 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GPSD_VERSION = 3.17
|
||||
GPSD_VERSION = 3.18
|
||||
GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
|
||||
GPSD_LICENSE = BSD-3-Clause
|
||||
GPSD_LICENSE_FILES = COPYING
|
||||
@@ -23,7 +23,8 @@ GPSD_SCONS_OPTS = \
|
||||
prefix=/usr\
|
||||
sysroot=$(STAGING_DIR)\
|
||||
strip=no\
|
||||
python=no
|
||||
python=no \
|
||||
qt=no
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
GPSD_DEPENDENCIES += ncurses
|
||||
@@ -48,14 +49,6 @@ ifeq ($(BR2_microblaze),y)
|
||||
GPSD_CFLAGS += -O0
|
||||
endif
|
||||
|
||||
# Enable or disable Qt binding
|
||||
ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
|
||||
GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)"
|
||||
GPSD_DEPENDENCIES += qt
|
||||
else
|
||||
GPSD_SCONS_OPTS += qt=no
|
||||
endif
|
||||
|
||||
# If libusb is available build it before so the package can use it
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB),y)
|
||||
GPSD_DEPENDENCIES += libusb
|
||||
@@ -112,6 +105,9 @@ endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y)
|
||||
GPSD_SCONS_OPTS += gpsclock=no
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_GREIS),y)
|
||||
GPSD_SCONS_OPTS += greis=no
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_ISYNC),y)
|
||||
GPSD_SCONS_OPTS += isync=no
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user