Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -1,41 +0,0 @@
|
||||
From 777cb3737ae85b13642fff48eabb601c4d40f527 Mon Sep 17 00:00:00 2001
|
||||
From: James Knight <james.d.knight@live.com>
|
||||
Date: Tue, 16 Feb 2016 23:51:08 -0500
|
||||
Subject: [PATCH] do not interact with systemctl when cross-compiling
|
||||
|
||||
The installation process for GPSd on a systemd environment will attempt
|
||||
to reload systemd's manager configuration (systemctl daemon-reload).
|
||||
This is to allow the system to take advantage of the newly installed
|
||||
GPSd services. When cross-compiling, the installation process should not
|
||||
attempt to interact with the build environment's systemd instance (if
|
||||
any). The following change checks if the build is not cross compiling
|
||||
(via 'not env["sysroot"]') before attempting to do a systemd reload.
|
||||
|
||||
Signed-off-by: James Knight <james.d.knight@live.com>
|
||||
[yann.morin.1998@free.fr: tweak to apply on 3.16]
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
SConstruct | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index c3bfd0d1..97c1b3a9 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -1909,10 +1909,12 @@ udev_install = Utility('udev-install', 'install', [
|
||||
] + hotplug_wrapper_install)
|
||||
|
||||
if env['systemd']:
|
||||
+ env.Requires(udev_install, systemd_install)
|
||||
+
|
||||
+if env['systemd'] and not env["sysroot"]:
|
||||
systemctl_daemon_reload = Utility('systemctl-daemon-reload', '', [ 'systemctl daemon-reload || true'])
|
||||
env.AlwaysBuild(systemctl_daemon_reload)
|
||||
env.Precious(systemctl_daemon_reload)
|
||||
- env.Requires(udev_install, systemd_install)
|
||||
env.Requires(systemctl_daemon_reload, systemd_install)
|
||||
env.Requires(udev_install, systemctl_daemon_reload)
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
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
|
||||
|
||||
@@ -10,10 +10,11 @@ menuconfig BR2_PACKAGE_GPSD
|
||||
# Always tries to build a shared library
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
gpsd is a service daemon that monitors one or more GPSes or AIS
|
||||
receivers attached to a host computer through serial or USB ports,
|
||||
making all data on the location/course/velocity of the sensors
|
||||
available to be queried on TCP port 2947 of the host computer.
|
||||
gpsd is a service daemon that monitors one or more GPSes or
|
||||
AIS receivers attached to a host computer through serial or
|
||||
USB ports, making all data on the location/course/velocity of
|
||||
the sensors available to be queried on TCP port 2947 of the
|
||||
host computer.
|
||||
|
||||
The D-Bus interface is included if dbus-glib is enabled.
|
||||
|
||||
@@ -37,6 +38,8 @@ config BR2_PACKAGE_GPSD_PROFILING
|
||||
bool "profiling support"
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on !BR2_aarch64
|
||||
# Needs glibc for ARC arc-2018.03-eng007+ for correct __mcount linking
|
||||
depends on !BR2_arc
|
||||
|
||||
comment "profiling support not available with uClibc-based toolchain"
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC
|
||||
@@ -151,6 +154,11 @@ config BR2_PACKAGE_GPSD_GPSCLOCK
|
||||
help
|
||||
GPSClock support
|
||||
|
||||
config BR2_PACKAGE_GPSD_ISYNC
|
||||
bool "iSync"
|
||||
help
|
||||
Spectratime iSync LNRClok/GRCLOK support
|
||||
|
||||
config BR2_PACKAGE_GPSD_ITRAX
|
||||
bool "iTrax"
|
||||
help
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 gpsd-3.16.tar.gz
|
||||
sha256 68e0dbecfb5831997f8b3d6ba48aed812eb465d8c0089420ab68f9ce4d85e77a gpsd-3.17.tar.gz
|
||||
sha256 71ff85d18bf063954cfc4251678d0e772223e21f80febbd99d5524c90f73f832 COPYING
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GPSD_VERSION = 3.16
|
||||
GPSD_VERSION = 3.17
|
||||
GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
|
||||
GPSD_LICENSE = BSD-3c
|
||||
GPSD_LICENSE = BSD-3-Clause
|
||||
GPSD_LICENSE_FILES = COPYING
|
||||
GPSD_INSTALL_STAGING = YES
|
||||
|
||||
@@ -111,6 +111,9 @@ endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y)
|
||||
GPSD_SCONS_OPTS += gpsclock=no
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_ISYNC),y)
|
||||
GPSD_SCONS_OPTS += isync=no
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y)
|
||||
GPSD_SCONS_OPTS += itrax=no
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user