Skip to contentSkip to conversation

package/gpsd: add whitespaces

PATCH New Bernd Kuhls 3 participants 9 messages Aug 6, 2019 – Aug 7, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/gpsd: add whitespaces

---
 package/gpsd/gpsd.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
package/gpsd/gpsd.mk +4 -4
index b4d0778b18..f1c7bb7349 100644
@@ -18,11 +18,11 @@ GPSD_CFLAGS = $(TARGET_CFLAGS)
 GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS)
 
 GPSD_SCONS_OPTS = \
-	arch=$(ARCH)\
+	arch=$(ARCH) \
 	manbuild=no \
-	prefix=/usr\
-	sysroot=$(STAGING_DIR)\
-	strip=no\
+	prefix=/usr \
+	sysroot=$(STAGING_DIR) \
+	strip=no \
 	python=no \
 	qt=no
 
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/3 package/gpsd: requires NTP time hinting support

Fixes
http://autobuild.buildroot.net/results/446/44639b8fe407bee30ac96ab54b8037439f3dac88/

Mandatory LEAP* defines are only enabled when TIMEHINT_ENABLE is
enabled: https://gitlab.com/gpsd/gpsd/blob/master/gpsd.h#L293

And TIMEHINT_ENABLE is only enabled when NTPSHM_ENABLE is enabled:
https://gitlab.com/gpsd/gpsd/blob/master/gpsd.h#L109

---
 Config.in.legacy       | 5 +++++
 package/gpsd/Config.in | 3 ---
 package/gpsd/gpsd.mk   | 6 ++----
 3 files changed, 7 insertions(+), 7 deletions(-)
Config.in.legacy +5 -0
index de05b07c97..f443ab0741 100644
@@ -146,6 +146,11 @@ endif
 
 comment "Legacy options removed in 2019.08"
 
+config BR2_PACKAGE_GPSD_NTP_SHM
+	bool "gpsd optional NTP time hinting support removed"
+	help
+	  gpsd requires NTP time hinting support
+
 config BR2_GCC_VERSION_6_X
 	bool "gcc 6.x support removed"
 	select BR2_LEGACY
package/gpsd/Config.in +0 -3
index 685830aed3..22f7e6e1d9 100644
@@ -44,9 +44,6 @@ config BR2_PACKAGE_GPSD_PROFILING
 comment "profiling support not available with uClibc-based toolchain"
 	depends on !BR2_TOOLCHAIN_USES_GLIBC
 
-config BR2_PACKAGE_GPSD_NTP_SHM
-	bool "NTP time hinting support"
-
 config BR2_PACKAGE_GPSD_PPS
 	bool "PPS time syncing support"
 	select BR2_PACKAGE_GPSD_NTP_SHM
package/gpsd/gpsd.mk +2 -4
index f1c7bb7349..79d2ccfeaa 100644
@@ -24,7 +24,8 @@ GPSD_SCONS_OPTS = \
 	sysroot=$(STAGING_DIR) \
 	strip=no \
 	python=no \
-	qt=no
+	qt=no \
+	ntpshm=yes
 
 ifeq ($(BR2_PACKAGE_NCURSES),y)
 GPSD_DEPENDENCIES += ncurses
@@ -161,9 +162,6 @@ GPSD_SCONS_OPTS += ublox=no
 endif
 
 # Features
-ifneq ($(BR2_PACKAGE_GPSD_NTP_SHM),y)
-GPSD_SCONS_OPTS += ntpshm=no
-endif
 ifneq ($(BR2_PACKAGE_GPSD_PPS),y)
 GPSD_SCONS_OPTS += pps=no
 endif
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/3 package/gpsd: requires NTP time hinting support

Hello Bernd,

Quoted 10 lines · On Tue, 6 Aug 2019 07:19:20 +0200 Bernd Kuhls <[email protected]> wrote:

Fixes
http://autobuild.buildroot.net/results/446/44639b8fe407bee30ac96ab54b8037439f3dac88/

Mandatory LEAP* defines are only enabled when TIMEHINT_ENABLE is
enabled: https://gitlab.com/gpsd/gpsd/blob/master/gpsd.h#L293

And TIMEHINT_ENABLE is only enabled when NTPSHM_ENABLE is enabled:
https://gitlab.com/gpsd/gpsd/blob/master/gpsd.h#L109

Perhaps it would be nice to check with upstream if this is intended or not. Indeed, it is weird that they provide an option, but this option cannot be disabled. At first sight, it feels like the solution is to fix the build issue, rather than to always enable the option.

Best regards,

Thomas

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

PATCH 2/3 package/gpsd: requires NTP time hinting support

Hello,

Quoted 6 lines · Thomas Petazzoni

Hello Bernd,

Perhaps it would be nice to check with upstream if this is intended or not. Indeed, it is weird that they provide an option, but this option cannot be disabled. At first sight, it feels like the solution is to fix the build issue, rather than to always enable the option.

There is now a patch upstream in master
https://gitlab.com/gpsd/gpsd/commit/8546be5f1eee36fd3fc66f09f2adfc18814d574c
, but it does not seem to apply as is on 3.19.

Quoted 5 lines

Best regards,

Thomas

Regards,

Titouan

#4 lore raw

PATCH 2/3 package/gpsd: requires NTP time hinting support

Am Tue, 06 Aug 2019 23:05:44 +0200 schrieb Titouan Christophe:

Quoted 5 lines

Hello,

Quoted 2 lines · Thomas Petazzoni

Hello Bernd,

Quoted 7 lines
Quoted 4 lines

Perhaps it would be nice to check with upstream if this is intended or not. Indeed, it is weird that they provide an option, but this option cannot be disabled. At first sight, it feels like the solution is to fix the build issue, rather than to always enable the option.

There is now a patch upstream in master
https://gitlab.com/gpsd/gpsd/commit/

8546be5f1eee36fd3fc66f09f2adfc18814d574c

Quoted 1 line

, but it does not seem to apply as is on 3.19.

Hi,

there is another patch on the master branch ( https://gitlab.com/gpsd/
gpsd/commit/5c4577e64c1ba89031391423e58407645d88856a ) which also removes the ntpshm option: "Remove NTP_ENABLE and NTPSHM_ENABLE. It only worked when enabled."

Until the master branch is released as a new version I think my patch is the way to go, upstream will remove ntpshm anyway.

Regards, BErnd

#5 lore raw

PATCH 2/3 package/gpsd: requires NTP time hinting support

In reply to Bernd Kuhls

Hello Bernd,

Quoted 10 lines · On Tue, 6 Aug 2019 07:19:20 +0200 Bernd Kuhls <[email protected]> wrote:

Fixes
http://autobuild.buildroot.net/results/446/44639b8fe407bee30ac96ab54b8037439f3dac88/

Mandatory LEAP* defines are only enabled when TIMEHINT_ENABLE is
enabled: https://gitlab.com/gpsd/gpsd/blob/master/gpsd.h#L293

And TIMEHINT_ENABLE is only enabled when NTPSHM_ENABLE is enabled:
https://gitlab.com/gpsd/gpsd/blob/master/gpsd.h#L109

Thanks a lot for the additional information provided, I've applied the patch after extending the commit log with those additional details.

Note that I have also dropped the Config.in.legacy option. Indeed, users who had the option enabled will still have it enabled, as it's now unconditionally enabled, so there's nothing to warn them about.

The only users who could be disappointed are users who had it disabled, as the feature will now be unconditionally enabled, slightly increasing the gpsd installation size. But this is not something that Config.in.legacy allows to detect.

Config.in.legacy endif · line 150

Quoted 10 lines
Config.in.legacy +2 -0
index de05b07c97..f443ab0741 100644
@@ -146,6 +146,11 @@ endif
 
 comment "Legacy options removed in 2019.08"
 
+config BR2_PACKAGE_GPSD_NTP_SHM
+	bool "gpsd optional NTP time hinting support removed"

For the record, an option in Config.in.legacy that doesn't select BR2_LEGACY is quite useless, as it doesn't prevent the build from starting.

Thanks!

Thomas

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

PATCH 3/3 DEVELOPERS: add Bernd Kuhls for gpsd

In reply to Bernd Kuhls
---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)
DEVELOPERS +1 -0
index 009845718d..444bf1b1c5 100644
@@ -309,6 +309,7 @@ F:	package/getdns/
 F:	package/giflib/
 F:	package/gli/
 F:	package/glmark2/
+F:	package/gpsd/
 F:	package/hdparm/
 F:	package/jsoncpp/
 F:	package/kodi*
Signature · 1 line
2.20.1
#7 lore raw

PATCH 3/3 DEVELOPERS: add Bernd Kuhls for gpsd

Quoted 4 lines · On Tue, 6 Aug 2019 07:19:21 +0200 Bernd Kuhls <[email protected]> wrote:
---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas

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