Skip to contentSkip to conversation

package/gpsd: bump version to 3.21

PATCH New Olivier Dautricourt 4 participants 6 messages Aug 24, 2020 – Oct 23, 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

---
 Config.in.legacy                              |  20 +++
 ...s-during-gpsd-3.20-cross-compilation.patch | 148 ------------------
 package/gpsd/Config.in                        |  16 --
 package/gpsd/gpsd.hash                        |   2 +-
 package/gpsd/gpsd.mk                          |  11 +-
 5 files changed, 22 insertions(+), 175 deletions(-)
 delete mode 100644 package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch
Config.in.legacy +20 -0
index 957cbb8b3c..e3a713cddc 100644
@@ -146,6 +146,26 @@ endif
 
 comment "Legacy options removed in 2020.08"
 
+config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED
+	bool "compile with fixed serial port speed"
+	select BR2_LEGACY
+	help
+	  Since gpsd 3.20, GPSD_FIXED_PORT_SPEED is replaced
+	  by runtime option --speed.
+
+config BR2_PACKAGE_GPSD_RECONFIGURE
+	bool "allow gpsd to change device settings"
+	select BR2_LEGACY
+	help
+	  Since gpsd 3.21, GPSD_RECONFIGURE is replaced
+	  by runtime option --passive.
+
+config BR2_PACKAGE_GPSD_CONTROLSEND
+	bool "allow gpsctl/gpsmon to change device settings"
+	select BR2_LEGACY
+	help
+	  Option removed in gpsd 3.21
+
 config BR2_PACKAGE_PHP_EXT_HASH
 	bool "php hash extension is mandatory"
 	select BR2_LEGACY
package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch deleted +0 -148

148 lines not on this page · raw message

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 2/2 package/gpsd: add GPSD_PYTHON config option

Hi Olivier,

Quoted 14 lines · Olivier Dautricourt

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 +0 -0
index 5dd57c34b8..39054098ba 100644

package/gpsd/Config.in config BR2_PACKAGE_GPSD_UBX · line 233

Quoted 5 lines
package/gpsd/Config.in +2 -0
@@ -229,4 +229,9 @@ config BR2_PACKAGE_GPSD_UBX
 	help
 	  uBlox UBX binary support
 
+config BR2_PACKAGE_GPSD_PYTHON
+	bool "Python library"

'depends on BR2_PACKAGE_PYTHON3' maybe?

What is the size impact of the python library? In the likely case it is orders of magnitude smaller than gpsd itself, you should install it unconditionally when BR2_PACKAGE_PYTHON3 is enabled.

baruch

Quoted 17 lines
package/gpsd/Config.in +3 -0
+	help
+	  gps Python library
+
 endif
package/gpsd/gpsd.mk +0 -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)
 

package/gpsd/gpsd.mk endif · line 188

Quoted 4 lines
package/gpsd/gpsd.mk +1 -0
@@ -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)

We don't add space before 'y'.

package/gpsd/gpsd.mk endif · line 190

Quoted 2 lines
package/gpsd/gpsd.mk +2 -0
+GPSD_SCONS_OPTS += python=yes
+GPSD_SCONS_OPTS += python_libdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/

Is there build time dependency on python3? If so, you should also add python3 to GPSD_DEPENDENCIES.

baruch

Quoted 6 lines
package/gpsd/gpsd.mk +3 -0
+else
+GPSD_SCONS_OPTS += python=no
+endif
 
 GPSD_SCONS_ENV += \
 	LDFLAGS="$(GPSD_LDFLAGS)" \
Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#3 lore raw

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

Quoted 21 lines · Baruch Siach

Hi Olivier,

Quoted 17 lines · Olivier Dautricourt

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 +0 -0
index 5dd57c34b8..39054098ba 100644
@@ -229,4 +229,9 @@ config BR2_PACKAGE_GPSD_UBX
      help
        uBlox UBX binary support
 
Quoted 8 lines

package/gpsd/Config.in config BR2_PACKAGE_GPSD_UBX · line 233

Quoted 2 lines
package/gpsd/Config.in +2 -0
+config BR2_PACKAGE_GPSD_PYTHON
+     bool "Python library"

'depends on BR2_PACKAGE_PYTHON3' maybe?

What is the size impact of the python library? In the likely case it is orders of magnitude smaller than gpsd itself, you should install it unconditionally when BR2_PACKAGE_PYTHON3 is enabled.

Ok i'll drop the GPSD_PYTHON option.

Quoted 27 lines

baruch

Quoted 17 lines
package/gpsd/Config.in +3 -0
+     help
+       gps Python library
+
 endif
package/gpsd/gpsd.mk +0 -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)
 

package/gpsd/gpsd.mk endif · line 188

Quoted 4 lines
package/gpsd/gpsd.mk +1 -0
@@ -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)

We don't add space before 'y'.

Quoted 5 lines

package/gpsd/gpsd.mk endif · line 190

Quoted 2 lines
package/gpsd/gpsd.mk +2 -0
+GPSD_SCONS_OPTS += python=yes
+GPSD_SCONS_OPTS += python_libdir=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/

Is there build time dependency on python3? If so, you should also add python3 to GPSD_DEPENDENCIES.

There is no build time dependency on python3 for the library. the scons script only copies the .py files into the site-packages directory.

Quoted 7 lines

baruch

Quoted 4 lines
package/gpsd/gpsd.mk +3 -0
+else
+GPSD_SCONS_OPTS += python=no
+endif
 
Quoted 7 lines

package/gpsd/gpsd.mk endif · line 196

Quoted 2 lines
package/gpsd/gpsd.mk +0 -0
 GPSD_SCONS_ENV += \
      LDFLAGS="$(GPSD_LDFLAGS)" \

--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

I'll send a V2 for this patch (2/2).

Regards,

Signature · 1 line
Olivier Dautricourt
#4 lore raw

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

Hello Oliver,

Quoted 5 lines

I'll send a V2 for this patch (2/2).

Regards,

Signature · 1 line
Olivier Dautricourt

Do you plan to work on the next revision of gpsd update patches ? Let me know if you don't have capacity for that at the moment. I have been recently working on the same update together with enablement of gpsfake python test tools. So I can pick up your changes and proceed.

Regards,
Sergey

#5 lore raw

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

In reply to Olivier Dautricourt

Hello Olivier and all,

Quoted 5 lines · Olivier Dautricourt

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

In my opinion, it would be better to rephrase the commit log in imperative style

Quoted 12 lines

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

---
  Config.in.legacy                              |  20 +++
  ...s-during-gpsd-3.20-cross-compilation.patch | 148 ------------------
  package/gpsd/Config.in                        |  16 --
  package/gpsd/gpsd.hash                        |   2 +-
  package/gpsd/gpsd.mk                          |  11 +-
  5 files changed, 22 insertions(+), 175 deletions(-)

delete mode 100644 package/gpsd/0001-Fix-errors-during-gpsd-3.20-cross-compilation.patch

[...]

package/gpsd/gpsd.hash line 3

Quoted 9 lines
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

The COPYING file has changed since 3.20 (see
https://gitlab.com/gpsd/gpsd/-/commit/0e40daf5e7b8d9686cf34a1b492205aab90b0328),
and its hash is no longer valid:

$ ./utils/test-pkg -p gpsd -n 1
                              br-arm-full [1/1]: FAILED
$ tail ~/br-test-pkg/br-arm-full/logfile
Quoted 1 line
Quoted 1 line
Quoted 1 line

gpsd 3.21 Collecting legal info

ERROR: COPYING has wrong sha256 hash:
ERROR: expected:
13ba6fe5b2f41f03b854f9ac5f271e116d5ed55890cc20f5fe44dcfa0dc5958b
ERROR: got :
fdf339997bbca9eaf507476b82fbcac608fc39a3d89b86b51e16db4c9f933716

Regards,
Titouan