Skip to contentSkip to conversation

package/gpsd: bump version to 3.21

PATCH New Olivier Dautricourt 2 participants 7 messages Aug 17, 2020 – Aug 18, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/gpsd: bump version to 3.21

- removed unnecessary patch
- removed obsolete gpsd options:
GPSD_CONTROLSEND
GPSD_RECONFIGURE
GPSD_FIXED_PORT_SPEED

ref: https://gpsd.gitlab.io/gpsd/NEWS

---
 ...s-during-gpsd-3.20-cross-compilation.patch | 148 ------------------
 package/gpsd/Config.in                        |  16 --
 package/gpsd/gpsd.hash                        |   2 +-
 package/gpsd/gpsd.mk                          |  11 +-
 4 files changed, 2 insertions(+), 175 deletions(-)
 delete mode 100644 package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch
package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch deleted +0 -148
deleted file mode 100644
index 7ab863d4a3..0000000000
@@ -1,148 +0,0 @@
-From 727c37ef78f2229998ac51942f5d11c754d0c6b9 Mon Sep 17 00:00:00 2001
-From: Robert Hancock <[email protected]>
-Date: Mon, 13 Jul 2020 17:33:48 -0600
-Subject: [PATCH] Fix errors during gpsd 3.20 cross-compilation
-
-Adapt some post-3.20 changes to the gpsd SConstruct file from the
-gpsd master branch to fix issues when cross-compiling. Original
-commits did not cherry-pick cleanly onto 3.20 due to other
-upstream changes.
-
-Signed-off-by: Robert Hancock <[email protected]>
----
- SConstruct | 81 ++++++++++++++++++++++--------------------------------
- 1 file changed, 33 insertions(+), 48 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 33e0ff326..93e8fcfea 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -386,13 +386,16 @@ env['SC_PYTHON'] = sys.executable  # Path to SCons Python
- # So we rely on MergeFlags/ParseFlags to do the right thing for us.
- env['STRIP'] = "strip"
- env['PKG_CONFIG'] = "pkg-config"
--for i in ["AR", "CC", "CXX", "LD",
--          "PKG_CONFIG", "STRIP", "TAR"]:
-+for i in ["AR",      # linker for static libs, usually "ar"
-+          "CC",
-+          "CXX",
-+          # "LD",    # scons does not use LD, usually "ld"
-+          "PKG_CONFIG",
-+          "SHLINK",  # linker for shared libs, usually "gcc" or "g++", NOT "ld"
-+          "STRIP",
-+          "TAR"]:
-     if i in os.environ:
--        j = i
--        if i == "LD":
--            i = "SHLINK"
--        env[i] = os.getenv(j)
-+        env[i] = os.getenv(i)
- for i in ["ARFLAGS", "CFLAGS", "CXXFLAGS", "LDFLAGS", "SHLINKFLAGS",
-           "CPPFLAGS", "CCFLAGS", "LINKFLAGS"]:
-     if i in os.environ:
-@@ -483,7 +486,7 @@ devenv = (("ADDR2LINE", "addr2line"),
-           ("GCCBUG", "gccbug"),
-           ("GCOV", "gcov"),
-           ("GPROF", "gprof"),
--          ("LD", "ld"),
-+          # ("LD", "ld"),     # scons does not use LD
-           ("NM", "nm"),
-           ("OBJCOPY", "objcopy"),
-           ("OBJDUMP", "objdump"),
-@@ -565,6 +568,22 @@ def CheckXsltproc(context):
-     return ret
- 
- 
-+def CheckTime_t(context):
-+    context.Message('Checking if sizeof(time_t) is 64 bits... ')
-+    ret = context.TryLink("""
-+        #include <time.h>
-+
-+        int main(int argc, char **argv) {
-+            static int test_array[1 - 2 * ((long int) sizeof(time_t) < 8 )];
-+            test_array[0] = 0;
-+            (void) argc; (void) argv;
-+            return 0;
-+        }
-+    """, '.c')
-+    context.Result(ret)
-+    return ret
-+
-+
- def CheckCompilerOption(context, option):
-     context.Message('Checking if compiler accepts %s... ' % (option,))
-     old_CFLAGS = context.env['CFLAGS'][:]  # Get a *copy* of the old list
-@@ -597,42 +616,6 @@ def CheckHeaderDefines(context, file, define):
-     return ret
- 
- 
--def CheckSizeOf(context, type):
--    """Check sizeof 'type'"""
--    context.Message('Checking size of ' + type + '... ')
--
--    program = """
--#include <stdlib.h>
--#include <stdio.h>
--
--/*
-- * The CheckSizeOf function does not have a way for the caller to
-- * specify header files to be included to provide the type being
-- * checked.  As a workaround until that is remedied, include the
-- * header required for time_t, which is the sole current use of this
-- * function.
-- */
--#include <time.h>
--
--int main() {
--    printf("%d", (int)sizeof(""" + type + """));
--    return 0;
--}
--"""
--
--    # compile it
--    ret = context.TryCompile(program, '.c')
--    if 0 == ret:
--        announce('ERROR: TryCompile failed\n')
--        # fall back to sizeof(time_t) is 8
--        return '8'
--
--    # run it
--    ret = context.TryRun(program, '.c')
--    context.Result(ret[0])
--    return ret[1]
--
--
- def CheckCompilerDefines(context, define):
-     context.Message('Checking if compiler supplies %s... ' % (define,))
-     ret = context.TryLink("""
-@@ -708,8 +691,8 @@ config = Configure(env, custom_tests={
-     'CheckCompilerOption': CheckCompilerOption,
-     'CheckHeaderDefines': CheckHeaderDefines,
-     'CheckPKG': CheckPKG,
--    'CheckSizeOf': CheckSizeOf,
-     'CheckXsltproc': CheckXsltproc,
-+    'CheckTime_t': CheckTime_t,
-     'GetPythonValue': GetPythonValue,
-     })
- 
-@@ -1043,11 +1026,13 @@ else:
-             confdefs.append("/* #undef HAVE_%s_H */\n"
-                             % hdr.replace("/", "_").upper())
- 
--    sizeof_time_t = config.CheckSizeOf("time_t")
--    confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t)
--    announce("sizeof(time_t) is %s" % sizeof_time_t)
--    if 4 >= int(sizeof_time_t):
-+    if 0 == config.CheckTime_t():
-         announce("WARNING: time_t is too small.  It will fail in 2038")
-+        sizeof_time_t = 4
-+    else:
-+        sizeof_time_t = 8
-+
-+    confdefs.append("#define SIZEOF_TIME_T %s\n" % sizeof_time_t)
- 
-     # check function after libraries, because some function require libraries
-     # for example clock_gettime() require librt on Linux glibc < 2.17
--- 
-2.18.4
-
package/gpsd/Config.in +0 -16
index 3e13f1ba71..5dd57c34b8 100644
@@ -60,14 +60,6 @@ config BR2_PACKAGE_GPSD_GROUP_VALUE
 	default "nobody"
 	depends on BR2_PACKAGE_GPSD_GROUP
 
-config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
-	bool "compile with fixed serial port speed"
-
-config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE
-	int "serial port speed"
-	default "9600"
-	depends on BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
-
 config BR2_PACKAGE_GPSD_MAX_CLIENT
 	bool "compile with limited maximum clients"
 
@@ -84,14 +76,6 @@ config BR2_PACKAGE_GPSD_MAX_DEV_VALUE
 	default "2"
 	depends on BR2_PACKAGE_GPSD_MAX_DEV
 
-config BR2_PACKAGE_GPSD_RECONFIGURE
-	bool "allow gpsd to change device settings"
-	default y
-
-config BR2_PACKAGE_GPSD_CONTROLSEND
-	bool "allow gpsctl/gpsmon to change device settings"
-	default y
-
 config BR2_PACKAGE_GPSD_SQUELCH
 	bool "squelch gpsd_report and gpsd_hexdump to save cpu"
 
package/gpsd/gpsd.hash +1 -1
index af53fc05bf..1888881942 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	172a7805068eacb815a3c5225436fcb0be46e7e49a5001a94034eac43df85e50	gpsd-3.20.tar.gz
+sha256	65504c3af8d3b0cce3c07405b8815d7730d2d2be2da7d28d275f1a9c57c6fe91	gpsd-3.21.tar.gz
 sha256	13ba6fe5b2f41f03b854f9ac5f271e116d5ed55890cc20f5fe44dcfa0dc5958b	COPYING
package/gpsd/gpsd.mk +1 -10
index 57955b7895..62c4c611c3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GPSD_VERSION = 3.20
+GPSD_VERSION = 3.21
 GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
 GPSD_LICENSE = BSD-2-Clause
 GPSD_LICENSE_FILES = COPYING
@@ -165,12 +165,6 @@ endif
 ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y)
 GPSD_SCONS_OPTS += squelch=yes
 endif
-ifneq ($(BR2_PACKAGE_GPSD_RECONFIGURE),y)
-GPSD_SCONS_OPTS += reconfigure=no
-endif
-ifneq ($(BR2_PACKAGE_GPSD_CONTROLSEND),y)
-GPSD_SCONS_OPTS += controlsend=no
-endif
 ifneq ($(BR2_PACKAGE_GPSD_OLDSTYLE),y)
 GPSD_SCONS_OPTS += oldstyle=no
 endif
@@ -186,9 +180,6 @@ endif
 ifeq ($(BR2_PACKAGE_GPSD_GROUP),y)
 GPSD_SCONS_OPTS += gpsd_group=$(BR2_PACKAGE_GPSD_GROUP_VALUE)
 endif
-ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y)
-GPSD_SCONS_OPTS += fixed_port_speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE)
-endif
 ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y)
 GPSD_SCONS_OPTS += max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE)
 endif
Signature · 1 line
2.25.1
#1 lore raw

PATCH 2/2 package/gpsd: add GPSD_PYTHON config option

The scons script will install the gps library in the target python3 directory, as well as useful tools like ubxtool.

---
 package/gpsd/Config.in | 5 +++++
 package/gpsd/gpsd.mk   | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)
package/gpsd/Config.in +5 -0
index 5dd57c34b8..39054098ba 100644
@@ -229,4 +229,9 @@ config BR2_PACKAGE_GPSD_UBX
 	help
 	  uBlox UBX binary support
 
+config BR2_PACKAGE_GPSD_PYTHON
+	bool "Python library"
+	help
+	  gps Python library
+
 endif
package/gpsd/gpsd.mk +6 -1
index 62c4c611c3..d2e5d57ca8 100644
@@ -23,7 +23,6 @@ GPSD_SCONS_OPTS = \
 	prefix=/usr \
 	sysroot=$(STAGING_DIR) \
 	strip=no \
-	python=no \
 	qt=no \
 	systemd=$(if $(BR2_INIT_SYSTEMD),yes,no)
 
@@ -186,6 +185,12 @@ endif
 ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y)
 GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE)
 endif
+ifeq ($(BR2_PACKAGE_GPSD_PYTHON), y)
+GPSD_SCONS_OPTS += python=yes
+GPSD_SCONS_OPTS += python_libdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/
+else
+GPSD_SCONS_OPTS += python=no
+endif
 
 GPSD_SCONS_ENV += \
 	LDFLAGS="$(GPSD_LDFLAGS)" \
Signature · 1 line
2.25.1
#2 lore raw

PATCH 1/2 package/gpsd: bump version to 3.21

In reply to Olivier Dautricourt

Hello,

Thanks for your patch.

Quoted 5 lines · On Mon, 17 Aug 2020 15:23:35 +0200 Olivier Dautricourt…

- removed unnecessary patch
- removed obsolete gpsd options:
GPSD_CONTROLSEND
GPSD_RECONFIGURE
GPSD_FIXED_PORT_SPEED

Could you comment about what happened to those options? Why were they removed? Indeed, we can't just drop Buildroot options like that. Depending on what happened to the corresponding features in upstream gpsd, we might need to add legacy handling for those options in Config.in.legacy.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/2 package/gpsd: bump version to 3.21

In reply to Thomas Petazzoni
Quoted 11 lines · Thomas Petazzoni

Hello,

Thanks for your patch.

Quoted 3 lines · On Mon, 17 Aug 2020 15:23:35 +0200 Olivier Dautricourt…

- removed unnecessary patch
- removed obsolete gpsd options:
GPSD_CONTROLSEND

Option was just removed upstream (e720403069dd6ca)
Reason given was: "It overlapped RECONFIGURE_ENABLE in strange ways". This was preventing gpsctl to configure receivers, but i guess this option is not relevant anymore.

Quoted 1 line
Quoted 1 line

GPSD_RECONFIGURE

Replaced with -p (--passive) runtime option. This is to prevent gpsd to auto-configure receivers.

Quoted 1 line
Quoted 1 line

GPSD_FIXED_PORT_SPEED

This option was already removed in 3.20.
It is replaced with -s <speed> runtime option.
FIXED_STOP_BITS was also replaced with -f <framing> opt but this was never included in the buildroot configuration anyway.

Quoted 7 lines

Could you comment about what happened to those options? Why were they removed? Indeed, we can't just drop Buildroot options like that. Depending on what happened to the corresponding features in upstream gpsd, we might need to add legacy handling for those options in Config.in.legacy.

Quoted 7 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

I just commented on the removal of those 3 options.

Regards,

Signature · 1 line
Olivier Dautricourt
#5 lore raw

PATCH 1/2 package/gpsd: bump version to 3.21

Hello Olivier,

Quoted 9 lines · On Tue, 18 Aug 2020 19:21:19 +0200 Olivier Dautricourt…
Quoted 3 lines
Quoted 3 lines

- removed unnecessary patch
- removed obsolete gpsd options:
GPSD_CONTROLSEND

Option was just removed upstream (e720403069dd6ca)
Reason given was: "It overlapped RECONFIGURE_ENABLE in strange ways". This was preventing gpsctl to configure receivers, but i guess this option is not relevant anymore.

Quoted 1 line
Quoted 1 line

GPSD_RECONFIGURE

Quoted 8 lines

Replaced with -p (--passive) runtime option. This is to prevent gpsd to auto-configure receivers.

Quoted 1 line
Quoted 1 line

GPSD_FIXED_PORT_SPEED

This option was already removed in 3.20.
It is replaced with -s <speed> runtime option.
FIXED_STOP_BITS was also replaced with -f <framing> opt but this was never included in the buildroot configuration anyway.

Then I think we need Config.in.legacy handling for the removal of those 3 options.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH 1/2 package/gpsd: bump version to 3.21

Hello Thomas,

Quoted 18 lines · Thomas Petazzoni

Hello Olivier,

Quoted 12 lines · On Tue, 18 Aug 2020 19:21:19 +0200 Olivier Dautricourt…
Quoted 3 lines
Quoted 3 lines

- removed unnecessary patch
- removed obsolete gpsd options:
GPSD_CONTROLSEND

Option was just removed upstream (e720403069dd6ca)
Reason given was: "It overlapped RECONFIGURE_ENABLE in strange ways". This was preventing gpsctl to configure receivers, but i guess this option is not relevant anymore.

Quoted 1 line
Quoted 1 line

GPSD_RECONFIGURE

Replaced with -p (--passive) runtime option. This is to prevent gpsd to auto-configure receivers.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line

GPSD_FIXED_PORT_SPEED

This option was already removed in 3.20.
It is replaced with -s <speed> runtime option.
FIXED_STOP_BITS was also replaced with -f <framing> opt but this was never included in the buildroot configuration anyway.

Then I think we need Config.in.legacy handling for the removal of those 3 options.

So i would add something like that to Config.in.legacy:

config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
bool "compile-time fixed port speed removed" select BR2_LEGACY
help
The option was replaced by runtime option -f <speed>

But do i have to take action on the package side such as patching the default gpsd.service file when the above option is selected:

ExecStart=/usr/local/sbin/gpsd -f ${BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE}

knowing that the service file could be overwritten by local overlays in the build process.

Thanks !

Signature · 1 line
Olivier Dautricourt