[ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation
@ 2019-08-15 12:56 Sascha Hauer
  2019-08-15 12:56 ` [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17 Sascha Hauer
  2019-08-16  5:55 ` [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation Denis OSTERLAND
  0 siblings, 2 replies; 8+ messages in thread
From: Sascha Hauer @ 2019-08-15 12:56 UTC (permalink / raw)
  To: ptxdist; +Cc: Andreas Schickedanz

From: Andreas Schickedanz <andreas.schickedanz@emlix.com>

Without overwriting the paths the files will be installed in
sysroot-host/local/bin,lib,man

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/host-python-scons.make | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/rules/host-python-scons.make b/rules/host-python-scons.make
index efca45148..9c78e53fc 100644
--- a/rules/host-python-scons.make
+++ b/rules/host-python-scons.make
@@ -29,5 +29,10 @@ HOST_PYTHON_SCONS_LICENSE_FILES	:= file://LICENSE.txt;md5=46ddf66004e5be5566367c
 # ----------------------------------------------------------------------------
 
 HOST_PYTHON_SCONS_CONF_TOOL	:= python
+HOST_PYTHON_SCONS_INSTALL_OPT  := install \
+	--install-scripts=/bin \
+	--install-lib=/lib/scons-$(HOST_PYTHON_SCONS_VERSION) \
+	--install-platlib=/lib/scons-$(HOST_PYTHON_SCONS_VERSION) \
+	--install-purelib=/lib/scons-$(HOST_PYTHON_SCONS_VERSION)
 
 # vim: syntax=make
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17
  2019-08-15 12:56 [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation Sascha Hauer
@ 2019-08-15 12:56 ` Sascha Hauer
  2019-08-15 13:05   ` Alexander Dahl
  2019-08-16  6:11   ` Denis OSTERLAND
  2019-08-16  5:55 ` [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation Denis OSTERLAND
  1 sibling, 2 replies; 8+ messages in thread
From: Sascha Hauer @ 2019-08-15 12:56 UTC (permalink / raw)
  To: ptxdist; +Cc: Fabian Godehardt

From: Fabian Godehardt <fg@emlix.com>

This updates gpsd from 2.39 to 3.17. The build system has changed from
autotools to scons in the meantime, so there are quite some changes
necessary.

Signed-off-by: Fabian Godehardt <fg@emlix.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 rules/gpsd.in   |  30 ++++++++----
 rules/gpsd.make | 120 ++++++++++++++++++++++++++++--------------------
 2 files changed, 90 insertions(+), 60 deletions(-)

diff --git a/rules/gpsd.in b/rules/gpsd.in
index ff270cff5..7a86967c4 100644
--- a/rules/gpsd.in
+++ b/rules/gpsd.in
@@ -1,13 +1,14 @@
 ## SECTION=system_libraries
 menuconfig GPSD
 	tristate
+	select HOST_PYTHON_SCONS
 	select LIBC_M
 	select LIBC_NSL
 	select LIBC_PTHREAD
 	select GCCLIBS_CXX
 	select GCCLIBS_GCC_S
-	select NCURSES		if GPSD_CGPS
-	select NCURSES		if GPSD_GPSMON
+	select NCURSES		if GPSD_NCURSES
+	select LIBUSB		if GPSD_USB
 	select DBUS_GLIB	if GPSD_DBUS
 	select PYTHON		if GPSD_PYTHON
 	prompt "gpsd                          "
@@ -21,6 +22,19 @@ menuconfig GPSD
 
 if GPSD
 
+config GPSD_NCURSES
+	bool
+	prompt "Enable tools using ncurses"
+	help
+	  Some tools use ncurses as interface. Enable this to get
+	  able to build them.
+
+config GPSD_USB
+	bool
+	prompt "Enable USB support"
+	help
+	  Enable this to ineract with devices using USB interface.
+
 config GPSD_PYTHON
 	bool
 	prompt "python bindings"
@@ -68,6 +82,10 @@ config GPSD_MAX_DEVICES
 
 menu "drivers"
 
+	config GPSD_DRIVER_BLUEZ
+		bool
+		prompt "bluez"
+
 	config GPSD_DRIVER_NMEA
 		bool
 		prompt "nmea"
@@ -208,14 +226,6 @@ menu "install options"
 		  received sentences to stdout. This makes the program
 		  useful as a pipe from gpsd to another program or file.
 
-	config GPSD_GPSFLASH
-		bool
-		prompt "gpsflash"
-		help
-		  This program is a firmware loader for GPS receivers
-		  connected via serial or USB port. Presently it supports
-		  only SiRF GPSes.
-
 	config GPSD_GPXLOGGER
 		bool
 		prompt "gpxlogger"
diff --git a/rules/gpsd.make b/rules/gpsd.make
index cec308af9..bd664c4dd 100644
--- a/rules/gpsd.make
+++ b/rules/gpsd.make
@@ -2,6 +2,9 @@
 #
 # Copyright (C) 2008 by J.Kilb
 #               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
+#               2019 by Fabian Godehardt <fg@emlix.com>
+#
+# See CREDITS for details about who has contributed to this project.
 #
 # For further information about the PTXdist project and license conditions
 # see the README file.
@@ -15,11 +18,11 @@ PACKAGES-$(PTXCONF_GPSD) += gpsd
 #
 # Paths and names
 #
-GPSD_VERSION	:= 2.39
-GPSD_MD5	:= 3db437196a6840c252fca99b6c19d4d0
+GPSD_VERSION	:= 3.17
+GPSD_MD5	:= e0cfadcf4a65dfbdd2afb11c58f4e4a1
 GPSD		:= gpsd-$(GPSD_VERSION)
 GPSD_SUFFIX	:= tar.gz
-GPSD_URL	:= $(call ptx/mirror, SF, gpsd.berlios/$(GPSD).$(GPSD_SUFFIX))
+GPSD_URL	:= http://download-mirror.savannah.gnu.org/releases/gpsd/$(GPSD).$(GPSD_SUFFIX)
 GPSD_SOURCE	:= $(SRCDIR)/$(GPSD).$(GPSD_SUFFIX)
 GPSD_DIR	:= $(BUILDDIR)/$(GPSD)
 
@@ -27,58 +30,78 @@ GPSD_DIR	:= $(BUILDDIR)/$(GPSD)
 # Prepare
 # ----------------------------------------------------------------------------
 
-GPSD_ENV = \
-	$(CROSS_ENV) \
-	PYTHON=$(CROSS_PYTHON)
+GPSD_CONF_TOOL	:= NO
 
-#
-# autoconf
-#
-GPSD_AUTOCONF := \
-	$(CROSS_AUTOCONF_USR) \
-	--without-x \
-	--$(call ptx/endis, PTXCONF_GPSD_PYTHON)-python \
-	--$(call ptx/endis, PTXCONF_GPSD_PROFILING)-profiling \
-	--$(call ptx/endis, PTXCONF_GPSD_NTPSHM)-ntpshm \
-	--$(call ptx/endis, PTXCONF_GPSD_PPS)-pps \
-	--$(call ptx/endis, PTXCONF_GPSD_PPS_ON_CTS)-pps-on-cts \
-	--$(call ptx/endis, PTXCONF_GPSD_DBUS)-dbus \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NMEA)-nmea \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_SIRF)-sirf \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TSIP)-tsip \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_FV18)-fv18 \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TRIPMATE)-tripmate \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_EARTHMATE)-earthmate \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_ITRAX)-itrax \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_ASHTECH)-ashtech \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NAVCOM)-navcom \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GARMIN)-garmin \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GARMINTXT)-garmintxt \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TNT)-tnt \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_UBX)-ubx \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_EVERMORE)-evermore \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GPSCLOCK)-gpsclock \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_RTCM104V2)-rtcm104v2 \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_RTCM104V3)-rtcm104v3 \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NTRIP)-ntrip \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_SUPERSTAR2)-superstar2 \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_OCEANSERVER)-oceanserver \
-	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_MKT3301)-mkt3301
+# we set directory entries to installation folder as
+# the scons script currently ignores a DESTDIR etc.
+GPSD_ENV = \
+	target=$(PTXCONF_GNU_TARGET) \
+	prefix=$(prefix) \
+	shared=yes \
+	sbindir=$(GPSD_PKGDIR)/usr/sbin \
+	bindir=$(GPSD_PKGDIR)/usr/sbin \
+	includedir=$(GPSD_PKGDIR)/usr/include \
+	libdir=$(GPSD_PKGDIR)/usr/lib \
+	docdir=$(GPSD_PKGDIR)/usr/share/doc \
+	mandir=$(GPSD_PKGDIR)/usr/share/man \
+	ncurses=$(call ptx/yesno, PTXCONF_GPSD_NCURSES) \
+	usb=$(call ptx/yesno, PTXCONF_GPSD_USB) \
+	bluez=$(call ptx/yesno, PTXCONF_GPSD_BLUEZ) \
+	python=$(call ptx/yesno, PTXCONF_GPSD_PYTHON) \
+	profiling=$(call ptx/yesno, PTXCONF_GPSD_PROFILING) \
+	ntpshm=$(call ptx/yesno, PTXCONF_GPSD_NTPSHM) \
+	pps=$(call ptx/yesno, PTXCONF_GPSD_PPS) \
+	dbus_export=$(call ptx/yesno, PTXCONF_GPSD_DBUS) \
+	nmea0183=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NMEA) \
+	sirf=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SIRF) \
+	tsip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TSIP) \
+	fv18=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_FV18) \
+	tripmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TRIPMATE) \
+	earthmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EARTHMATE) \
+	itrax=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ITRAX) \
+	ashtech=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ASHTECH) \
+	navcom=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NAVCOM) \
+	garmin=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GARMIN) \
+	garmintxt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GARMINTXT) \
+	tnt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TNT) \
+	ubx=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_UBX) \
+	evermore=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EVERMORE) \
+	gpsclock=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GPSCLOCK) \
+	rtcm104v2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V2) \
+	rtcm104v3=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V3) \
+	ntrip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NTRIP) \
+	superstar2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SUPERSTAR2) \
+	oceanserver=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_OCEANSERVER) \
+	mkt3301=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_MKT3301)
 
 ifneq ($(call remove_quotes,$(PTXCONF_GPSD_USER)),)
-GPSD_AUTOCONF += --enable-gpsd-user=$(PTXCONF_GPSD_USER)
+GPSD_ENV += gpsd-user=$(PTXCONF_GPSD_USER)
 endif
 ifneq ($(call remove_quotes,$(PTXCONF_GPSD_FIXED_PORT_SPEED)),)
-GPSD_AUTOCONF += --enable-fixed-port-speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
+GPSD_ENV += fixed-port-speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
 endif
 
 ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_CLIENTS)),)
-GPSD_AUTOCONF += --enable-max-clients=$(PTXCONF_GPSD_MAX_CLIENTS)
+GPSD_ENV += max-clients=$(PTXCONF_GPSD_MAX_CLIENTS)
 endif
 ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_DEVICES)),)
-GPSD_AUTOCONF += --enable-max-devices=$(PTXCONF_GPSD_MAX_DEVICES)
+GPSD_ENV += max-devices=$(PTXCONF_GPSD_MAX_DEVICES)
 endif
 
+$(STATEDIR)/gpsd.prepare:
+	@$(call targetinfo)
+	@scons -C $(GPSD_DIR) $(GPSD_ENV)
+	@$(call touch)
+
+$(STATEDIR)/gpsd.compile:
+	@$(call targetinfo)
+	@$(call touch)
+
+$(STATEDIR)/gpsd.install:
+	@$(call targetinfo)
+	@scons -C $(GPSD_DIR) $(GPSD_ENV) install
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -98,16 +121,13 @@ ifdef PTXCONF_GPSD_GPSD
 	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsd)
 endif
 ifdef PTXCONF_GPSD_GPSCTL
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsctl)
+	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsctl)
 endif
 ifdef PTXCONF_GPSD_GPSPIPE
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpspipe)
-endif
-ifdef PTXCONF_GPSD_GPSFLASH
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsflash)
+	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpspipe)
 endif
 ifdef PTXCONF_GPSD_GPXLOGGER
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpxlogger)
+	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpxlogger)
 endif
 ifdef PTXCONF_GPSD_CGPS
 	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/cgps)
@@ -116,7 +136,7 @@ ifdef PTXCONF_GPSD_GPSMON
 	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsmon)
 endif
 ifdef PTXCONF_GPSD_GPSDECODE
-	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsdecode)
+	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsdecode)
 endif
 
 ifdef PTXCONF_GPSD_GPSCAT
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17
  2019-08-15 12:56 ` [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17 Sascha Hauer
@ 2019-08-15 13:05   ` Alexander Dahl
  2019-08-15 13:18     ` Sascha Hauer
  2019-08-16  6:11   ` Denis OSTERLAND
  1 sibling, 1 reply; 8+ messages in thread
From: Alexander Dahl @ 2019-08-15 13:05 UTC (permalink / raw)
  To: ptxdist; +Cc: Fabian Godehardt

Hello,

fyi, there were some patch sets sent to this list in January updating gpsd to 
3.18.1 already. Those did not get merged though:

v3: https://www.mail-archive.com/ptxdist@pengutronix.de/msg13944.html
v4: https://www.mail-archive.com/ptxdist@pengutronix.de/msg13985.html

Greets
Alex

Am Donnerstag, 15. August 2019, 14:56:19 CEST schrieb Sascha Hauer:
> From: Fabian Godehardt <fg@emlix.com>
> 
> This updates gpsd from 2.39 to 3.17. The build system has changed from
> autotools to scons in the meantime, so there are quite some changes
> necessary.
> 
> Signed-off-by: Fabian Godehardt <fg@emlix.com>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  rules/gpsd.in   |  30 ++++++++----
>  rules/gpsd.make | 120 ++++++++++++++++++++++++++++--------------------
>  2 files changed, 90 insertions(+), 60 deletions(-)
> 
> diff --git a/rules/gpsd.in b/rules/gpsd.in
> index ff270cff5..7a86967c4 100644
> --- a/rules/gpsd.in
> +++ b/rules/gpsd.in
> @@ -1,13 +1,14 @@
>  ## SECTION=system_libraries
>  menuconfig GPSD
>  	tristate
> +	select HOST_PYTHON_SCONS
>  	select LIBC_M
>  	select LIBC_NSL
>  	select LIBC_PTHREAD
>  	select GCCLIBS_CXX
>  	select GCCLIBS_GCC_S
> -	select NCURSES		if GPSD_CGPS
> -	select NCURSES		if GPSD_GPSMON
> +	select NCURSES		if GPSD_NCURSES
> +	select LIBUSB		if GPSD_USB
>  	select DBUS_GLIB	if GPSD_DBUS
>  	select PYTHON		if GPSD_PYTHON
>  	prompt "gpsd                          "
> @@ -21,6 +22,19 @@ menuconfig GPSD
> 
>  if GPSD
> 
> +config GPSD_NCURSES
> +	bool
> +	prompt "Enable tools using ncurses"
> +	help
> +	  Some tools use ncurses as interface. Enable this to get
> +	  able to build them.
> +
> +config GPSD_USB
> +	bool
> +	prompt "Enable USB support"
> +	help
> +	  Enable this to ineract with devices using USB interface.
> +
>  config GPSD_PYTHON
>  	bool
>  	prompt "python bindings"
> @@ -68,6 +82,10 @@ config GPSD_MAX_DEVICES
> 
>  menu "drivers"
> 
> +	config GPSD_DRIVER_BLUEZ
> +		bool
> +		prompt "bluez"
> +
>  	config GPSD_DRIVER_NMEA
>  		bool
>  		prompt "nmea"
> @@ -208,14 +226,6 @@ menu "install options"
>  		  received sentences to stdout. This makes the program
>  		  useful as a pipe from gpsd to another program or file.
> 
> -	config GPSD_GPSFLASH
> -		bool
> -		prompt "gpsflash"
> -		help
> -		  This program is a firmware loader for GPS receivers
> -		  connected via serial or USB port. Presently it supports
> -		  only SiRF GPSes.
> -
>  	config GPSD_GPXLOGGER
>  		bool
>  		prompt "gpxlogger"
> diff --git a/rules/gpsd.make b/rules/gpsd.make
> index cec308af9..bd664c4dd 100644
> --- a/rules/gpsd.make
> +++ b/rules/gpsd.make
> @@ -2,6 +2,9 @@
>  #
>  # Copyright (C) 2008 by J.Kilb
>  #               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
> +#               2019 by Fabian Godehardt <fg@emlix.com>
> +#
> +# See CREDITS for details about who has contributed to this project.
>  #
>  # For further information about the PTXdist project and license conditions
>  # see the README file.
> @@ -15,11 +18,11 @@ PACKAGES-$(PTXCONF_GPSD) += gpsd
>  #
>  # Paths and names
>  #
> -GPSD_VERSION	:= 2.39
> -GPSD_MD5	:= 3db437196a6840c252fca99b6c19d4d0
> +GPSD_VERSION	:= 3.17
> +GPSD_MD5	:= e0cfadcf4a65dfbdd2afb11c58f4e4a1
>  GPSD		:= gpsd-$(GPSD_VERSION)
>  GPSD_SUFFIX	:= tar.gz
> -GPSD_URL	:= $(call ptx/mirror, SF, gpsd.berlios/$(GPSD).$(GPSD_SUFFIX))
> +GPSD_URL	:=
> http://download-mirror.savannah.gnu.org/releases/gpsd/$(GPSD).$(GPSD_SUFFIX
> ) GPSD_SOURCE	:= $(SRCDIR)/$(GPSD).$(GPSD_SUFFIX)
>  GPSD_DIR	:= $(BUILDDIR)/$(GPSD)
> 
> @@ -27,58 +30,78 @@ GPSD_DIR	:= $(BUILDDIR)/$(GPSD)
>  # Prepare
>  #
> ---------------------------------------------------------------------------
> -
> 
> -GPSD_ENV = \
> -	$(CROSS_ENV) \
> -	PYTHON=$(CROSS_PYTHON)
> +GPSD_CONF_TOOL	:= NO
> 
> -#
> -# autoconf
> -#
> -GPSD_AUTOCONF := \
> -	$(CROSS_AUTOCONF_USR) \
> -	--without-x \
> -	--$(call ptx/endis, PTXCONF_GPSD_PYTHON)-python \
> -	--$(call ptx/endis, PTXCONF_GPSD_PROFILING)-profiling \
> -	--$(call ptx/endis, PTXCONF_GPSD_NTPSHM)-ntpshm \
> -	--$(call ptx/endis, PTXCONF_GPSD_PPS)-pps \
> -	--$(call ptx/endis, PTXCONF_GPSD_PPS_ON_CTS)-pps-on-cts \
> -	--$(call ptx/endis, PTXCONF_GPSD_DBUS)-dbus \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NMEA)-nmea \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_SIRF)-sirf \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TSIP)-tsip \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_FV18)-fv18 \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TRIPMATE)-tripmate \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_EARTHMATE)-earthmate \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_ITRAX)-itrax \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_ASHTECH)-ashtech \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NAVCOM)-navcom \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GARMIN)-garmin \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GARMINTXT)-garmintxt \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TNT)-tnt \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_UBX)-ubx \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_EVERMORE)-evermore \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GPSCLOCK)-gpsclock \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_RTCM104V2)-rtcm104v2 \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_RTCM104V3)-rtcm104v3 \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NTRIP)-ntrip \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_SUPERSTAR2)-superstar2 \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_OCEANSERVER)-oceanserver \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_MKT3301)-mkt3301
> +# we set directory entries to installation folder as
> +# the scons script currently ignores a DESTDIR etc.
> +GPSD_ENV = \
> +	target=$(PTXCONF_GNU_TARGET) \
> +	prefix=$(prefix) \
> +	shared=yes \
> +	sbindir=$(GPSD_PKGDIR)/usr/sbin \
> +	bindir=$(GPSD_PKGDIR)/usr/sbin \
> +	includedir=$(GPSD_PKGDIR)/usr/include \
> +	libdir=$(GPSD_PKGDIR)/usr/lib \
> +	docdir=$(GPSD_PKGDIR)/usr/share/doc \
> +	mandir=$(GPSD_PKGDIR)/usr/share/man \
> +	ncurses=$(call ptx/yesno, PTXCONF_GPSD_NCURSES) \
> +	usb=$(call ptx/yesno, PTXCONF_GPSD_USB) \
> +	bluez=$(call ptx/yesno, PTXCONF_GPSD_BLUEZ) \
> +	python=$(call ptx/yesno, PTXCONF_GPSD_PYTHON) \
> +	profiling=$(call ptx/yesno, PTXCONF_GPSD_PROFILING) \
> +	ntpshm=$(call ptx/yesno, PTXCONF_GPSD_NTPSHM) \
> +	pps=$(call ptx/yesno, PTXCONF_GPSD_PPS) \
> +	dbus_export=$(call ptx/yesno, PTXCONF_GPSD_DBUS) \
> +	nmea0183=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NMEA) \
> +	sirf=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SIRF) \
> +	tsip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TSIP) \
> +	fv18=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_FV18) \
> +	tripmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TRIPMATE) \
> +	earthmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EARTHMATE) \
> +	itrax=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ITRAX) \
> +	ashtech=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ASHTECH) \
> +	navcom=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NAVCOM) \
> +	garmin=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GARMIN) \
> +	garmintxt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GARMINTXT) \
> +	tnt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TNT) \
> +	ubx=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_UBX) \
> +	evermore=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EVERMORE) \
> +	gpsclock=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GPSCLOCK) \
> +	rtcm104v2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V2) \
> +	rtcm104v3=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V3) \
> +	ntrip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NTRIP) \
> +	superstar2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SUPERSTAR2) \
> +	oceanserver=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_OCEANSERVER) \
> +	mkt3301=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_MKT3301)
> 
>  ifneq ($(call remove_quotes,$(PTXCONF_GPSD_USER)),)
> -GPSD_AUTOCONF += --enable-gpsd-user=$(PTXCONF_GPSD_USER)
> +GPSD_ENV += gpsd-user=$(PTXCONF_GPSD_USER)
>  endif
>  ifneq ($(call remove_quotes,$(PTXCONF_GPSD_FIXED_PORT_SPEED)),)
> -GPSD_AUTOCONF += --enable-fixed-port-speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
> +GPSD_ENV += fixed-port-speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
>  endif
> 
>  ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_CLIENTS)),)
> -GPSD_AUTOCONF += --enable-max-clients=$(PTXCONF_GPSD_MAX_CLIENTS)
> +GPSD_ENV += max-clients=$(PTXCONF_GPSD_MAX_CLIENTS)
>  endif
>  ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_DEVICES)),)
> -GPSD_AUTOCONF += --enable-max-devices=$(PTXCONF_GPSD_MAX_DEVICES)
> +GPSD_ENV += max-devices=$(PTXCONF_GPSD_MAX_DEVICES)
>  endif
> 
> +$(STATEDIR)/gpsd.prepare:
> +	@$(call targetinfo)
> +	@scons -C $(GPSD_DIR) $(GPSD_ENV)
> +	@$(call touch)
> +
> +$(STATEDIR)/gpsd.compile:
> +	@$(call targetinfo)
> +	@$(call touch)
> +
> +$(STATEDIR)/gpsd.install:
> +	@$(call targetinfo)
> +	@scons -C $(GPSD_DIR) $(GPSD_ENV) install
> +	@$(call touch)
> +
>  #
> ---------------------------------------------------------------------------
> - # Target-Install
>  #
> ---------------------------------------------------------------------------
> - @@ -98,16 +121,13 @@ ifdef PTXCONF_GPSD_GPSD
>  	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsd)
>  endif
>  ifdef PTXCONF_GPSD_GPSCTL
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsctl)
> +	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsctl)
>  endif
>  ifdef PTXCONF_GPSD_GPSPIPE
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpspipe)
> -endif
> -ifdef PTXCONF_GPSD_GPSFLASH
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsflash)
> +	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpspipe)
>  endif
>  ifdef PTXCONF_GPSD_GPXLOGGER
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpxlogger)
> +	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpxlogger)
>  endif
>  ifdef PTXCONF_GPSD_CGPS
>  	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/cgps)
> @@ -116,7 +136,7 @@ ifdef PTXCONF_GPSD_GPSMON
>  	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsmon)
>  endif
>  ifdef PTXCONF_GPSD_GPSDECODE
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsdecode)
> +	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsdecode)
>  endif
> 
>  ifdef PTXCONF_GPSD_GPSCAT



_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17
  2019-08-15 13:05   ` Alexander Dahl
@ 2019-08-15 13:18     ` Sascha Hauer
  0 siblings, 0 replies; 8+ messages in thread
From: Sascha Hauer @ 2019-08-15 13:18 UTC (permalink / raw)
  To: Alexander Dahl; +Cc: ptxdist, Fabian Godehardt

Hi Alexander,

On Thu, Aug 15, 2019 at 03:05:03PM +0200, Alexander Dahl wrote:
> Hello,
> 
> fyi, there were some patch sets sent to this list in January updating gpsd to 
> 3.18.1 already. Those did not get merged though:
> 
> v3: https://www.mail-archive.com/ptxdist@pengutronix.de/msg13944.html
> v4: https://www.mail-archive.com/ptxdist@pengutronix.de/msg13985.html

Thanks for noting, I wasn't aware of that.

BTW. I just saw that since july 3.19 is the current version.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17
  2019-08-15 12:56 ` [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17 Sascha Hauer
  2019-08-15 13:05   ` Alexander Dahl
@ 2019-08-16  6:11   ` Denis OSTERLAND
  2019-08-16  9:00     ` Sascha Hauer
  1 sibling, 1 reply; 8+ messages in thread
From: Denis OSTERLAND @ 2019-08-16  6:11 UTC (permalink / raw)
  To: ptxdist

Hi,


Am Donnerstag, den 15.08.2019, 14:56 +0200 schrieb Sascha Hauer:
> From: Fabian Godehardt <fg@emlix.com>
> 
> This updates gpsd from 2.39 to 3.17. The build system has changed from
> autotools to scons in the meantime, so there are quite some changes
> necessary.
> 
> Signed-off-by: Fabian Godehardt <fg@emlix.com>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  rules/gpsd.in   |  30 ++++++++----
>  rules/gpsd.make | 120 ++++++++++++++++++++++++++++--------------------
please remove old patches

>  2 files changed, 90 insertions(+), 60 deletions(-)
> 
> diff --git a/rules/gpsd.in b/rules/gpsd.in
> index ff270cff5..7a86967c4 100644
> --- a/rules/gpsd.in
> +++ b/rules/gpsd.in
> @@ -1,13 +1,14 @@
>  ## SECTION=system_libraries
>  menuconfig GPSD
>  	tristate
> +	select HOST_PYTHON_SCONS
>  	select LIBC_M
>  	select LIBC_NSL
>  	select LIBC_PTHREAD
>  	select GCCLIBS_CXX
>  	select GCCLIBS_GCC_S
> -	select NCURSES		if GPSD_CGPS
> -	select NCURSES		if GPSD_GPSMON
> +	select NCURSES		if GPSD_NCURSES
> +	select LIBUSB		if GPSD_USB
>  	select DBUS_GLIB	if GPSD_DBUS
>  	select PYTHON		if GPSD_PYTHON
>  	prompt "gpsd                          "
> @@ -21,6 +22,19 @@ menuconfig GPSD
>  
>  if GPSD
>  
> +config GPSD_NCURSES
> +	bool
> +	prompt "Enable tools using ncurses"
> +	help
> +	  Some tools use ncurses as interface. Enable this to get
> +	  able to build them.
> +
> +config GPSD_USB
> +	bool
> +	prompt "Enable USB support"
> +	help
> +	  Enable this to ineract with devices using USB interface.
> +
>  config GPSD_PYTHON
>  	bool
>  	prompt "python bindings"
> @@ -68,6 +82,10 @@ config GPSD_MAX_DEVICES
>  
>  menu "drivers"
>  
> +	config GPSD_DRIVER_BLUEZ
> +		bool
> +		prompt "bluez"
> +
>  	config GPSD_DRIVER_NMEA
>  		bool
>  		prompt "nmea"
> @@ -208,14 +226,6 @@ menu "install options"
>  		  received sentences to stdout. This makes the program
>  		  useful as a pipe from gpsd to another program or file.
>  
> -	config GPSD_GPSFLASH
> -		bool
> -		prompt "gpsflash"
> -		help
> -		  This program is a firmware loader for GPS receivers
> -		  connected via serial or USB port. Presently it supports
> -		  only SiRF GPSes.
> -
>  	config GPSD_GPXLOGGER
>  		bool
>  		prompt "gpxlogger"
> diff --git a/rules/gpsd.make b/rules/gpsd.make
> index cec308af9..bd664c4dd 100644
> --- a/rules/gpsd.make
> +++ b/rules/gpsd.make
> @@ -2,6 +2,9 @@
>  #
>  # Copyright (C) 2008 by J.Kilb
>  #               2009 by Marc Kleine-Budde <mkl@pengutronix.de>
> +#               2019 by Fabian Godehardt <fg@emlix.com>
> +#
> +# See CREDITS for details about who has contributed to this project.
>  #
>  # For further information about the PTXdist project and license conditions
>  # see the README file.
> @@ -15,11 +18,11 @@ PACKAGES-$(PTXCONF_GPSD) += gpsd
>  #
>  # Paths and names
>  #
> -GPSD_VERSION	:= 2.39
> -GPSD_MD5	:= 3db437196a6840c252fca99b6c19d4d0
> +GPSD_VERSION	:= 3.17
> +GPSD_MD5	:= e0cfadcf4a65dfbdd2afb11c58f4e4a1
>  GPSD		:= gpsd-$(GPSD_VERSION)
>  GPSD_SUFFIX	:= tar.gz
> -GPSD_URL	:= $(call ptx/mirror, SF, gpsd.berlios/$(GPSD).$(GPSD_SUFFIX))
> +GPSD_URL	:= http://download-mirror.savannah.gnu.org/releases/gpsd/$(GPSD).$(GPSD_SUFFIX)
>  GPSD_SOURCE	:= $(SRCDIR)/$(GPSD).$(GPSD_SUFFIX)
>  GPSD_DIR	:= $(BUILDDIR)/$(GPSD)
>  
> @@ -27,58 +30,78 @@ GPSD_DIR	:= $(BUILDDIR)/$(GPSD)
>  # Prepare
>  # ----------------------------------------------------------------------------
>  
> -GPSD_ENV = \
> -	$(CROSS_ENV) \
> -	PYTHON=$(CROSS_PYTHON)
> +GPSD_CONF_TOOL	:= NO
>  
> -#
> -# autoconf
> -#
> -GPSD_AUTOCONF := \
> -	$(CROSS_AUTOCONF_USR) \
> -	--without-x \
> -	--$(call ptx/endis, PTXCONF_GPSD_PYTHON)-python \
> -	--$(call ptx/endis, PTXCONF_GPSD_PROFILING)-profiling \
> -	--$(call ptx/endis, PTXCONF_GPSD_NTPSHM)-ntpshm \
> -	--$(call ptx/endis, PTXCONF_GPSD_PPS)-pps \
> -	--$(call ptx/endis, PTXCONF_GPSD_PPS_ON_CTS)-pps-on-cts \
> -	--$(call ptx/endis, PTXCONF_GPSD_DBUS)-dbus \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NMEA)-nmea \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_SIRF)-sirf \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TSIP)-tsip \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_FV18)-fv18 \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TRIPMATE)-tripmate \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_EARTHMATE)-earthmate \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_ITRAX)-itrax \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_ASHTECH)-ashtech \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NAVCOM)-navcom \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GARMIN)-garmin \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GARMINTXT)-garmintxt \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_TNT)-tnt \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_UBX)-ubx \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_EVERMORE)-evermore \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_GPSCLOCK)-gpsclock \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_RTCM104V2)-rtcm104v2 \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_RTCM104V3)-rtcm104v3 \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_NTRIP)-ntrip \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_SUPERSTAR2)-superstar2 \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_OCEANSERVER)-oceanserver \
> -	--$(call ptx/endis, PTXCONF_GPSD_DRIVER_MKT3301)-mkt3301
> +# we set directory entries to installation folder as
> +# the scons script currently ignores a DESTDIR etc.
> +GPSD_ENV = \
> +	target=$(PTXCONF_GNU_TARGET) \
> +	prefix=$(prefix) \
were comes prefix from?

> +	shared=yes \
> +	sbindir=$(GPSD_PKGDIR)/usr/sbin \
> +	bindir=$(GPSD_PKGDIR)/usr/sbin \
> +	includedir=$(GPSD_PKGDIR)/usr/include \
> +	libdir=$(GPSD_PKGDIR)/usr/lib \
> +	docdir=$(GPSD_PKGDIR)/usr/share/doc \
> +	mandir=$(GPSD_PKGDIR)/usr/share/man \
with DESTDIR=$(GPSD_PKGDIR) scons I didn't needed that

> +	ncurses=$(call ptx/yesno, PTXCONF_GPSD_NCURSES) \
> +	usb=$(call ptx/yesno, PTXCONF_GPSD_USB) \
> +	bluez=$(call ptx/yesno, PTXCONF_GPSD_BLUEZ) \
> +	python=$(call ptx/yesno, PTXCONF_GPSD_PYTHON) \
> +	profiling=$(call ptx/yesno, PTXCONF_GPSD_PROFILING) \
> +	ntpshm=$(call ptx/yesno, PTXCONF_GPSD_NTPSHM) \
> +	pps=$(call ptx/yesno, PTXCONF_GPSD_PPS) \
> +	dbus_export=$(call ptx/yesno, PTXCONF_GPSD_DBUS) \
> +	nmea0183=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NMEA) \
> +	sirf=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SIRF) \
> +	tsip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TSIP) \
> +	fv18=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_FV18) \
> +	tripmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TRIPMATE) \
> +	earthmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EARTHMATE) \
> +	itrax=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ITRAX) \
> +	ashtech=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ASHTECH) \
> +	navcom=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NAVCOM) \
> +	garmin=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GARMIN) \
> +	garmintxt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GARMINTXT) \
> +	tnt=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_TNT) \
> +	ubx=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_UBX) \
> +	evermore=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EVERMORE) \
> +	gpsclock=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_GPSCLOCK) \
> +	rtcm104v2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V2) \
> +	rtcm104v3=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_RTCM104V3) \
> +	ntrip=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_NTRIP) \
> +	superstar2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SUPERSTAR2) \
> +	oceanserver=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_OCEANSERVER) \
> +	mkt3301=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_MKT3301)
as far as I got Michael the ENV needs PATH=$(CROSS_PATH) for python support
>  
>  ifneq ($(call remove_quotes,$(PTXCONF_GPSD_USER)),)
> -GPSD_AUTOCONF += --enable-gpsd-user=$(PTXCONF_GPSD_USER)
> +GPSD_ENV += gpsd-user=$(PTXCONF_GPSD_USER)
>  endif
>  ifneq ($(call remove_quotes,$(PTXCONF_GPSD_FIXED_PORT_SPEED)),)
> -GPSD_AUTOCONF += --enable-fixed-port-speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
> +GPSD_ENV += fixed-port-speed=$(PTXCONF_GPSD_FIXED_PORT_SPEED)
>  endif
>  
>  ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_CLIENTS)),)
> -GPSD_AUTOCONF += --enable-max-clients=$(PTXCONF_GPSD_MAX_CLIENTS)
> +GPSD_ENV += max-clients=$(PTXCONF_GPSD_MAX_CLIENTS)
>  endif
>  ifneq ($(call remove_quotes,$(PTXCONF_GPSD_MAX_DEVICES)),)
> -GPSD_AUTOCONF += --enable-max-devices=$(PTXCONF_GPSD_MAX_DEVICES)
> +GPSD_ENV += max-devices=$(PTXCONF_GPSD_MAX_DEVICES)
>  endif
>  
> +$(STATEDIR)/gpsd.prepare:
> +	@$(call targetinfo)
> +	@scons -C $(GPSD_DIR) $(GPSD_ENV)
> +	@$(call touch)
> +
> +$(STATEDIR)/gpsd.compile:
> +	@$(call targetinfo)
> +	@$(call touch)
> +
I would prefer to drop prepare stage entirely and compile in compile stage

> +$(STATEDIR)/gpsd.install:
> +	@$(call targetinfo)
> +	@scons -C $(GPSD_DIR) $(GPSD_ENV) install
> +	@$(call touch)
> +
>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> @@ -98,16 +121,13 @@ ifdef PTXCONF_GPSD_GPSD
>  	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsd)
>  endif
>  ifdef PTXCONF_GPSD_GPSCTL
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsctl)
> +	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsctl)
>  endif
>  ifdef PTXCONF_GPSD_GPSPIPE
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpspipe)
> -endif
> -ifdef PTXCONF_GPSD_GPSFLASH
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsflash)
> +	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpspipe)
>  endif
>  ifdef PTXCONF_GPSD_GPXLOGGER
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpxlogger)
> +	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpxlogger)
>  endif
>  ifdef PTXCONF_GPSD_CGPS
>  	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/cgps)
> @@ -116,7 +136,7 @@ ifdef PTXCONF_GPSD_GPSMON
>  	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsmon)
>  endif
>  ifdef PTXCONF_GPSD_GPSDECODE
> -	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsdecode)
> +	@$(call install_copy, gpsd, 0, 0, 0755, -, /usr/sbin/gpsdecode)
These changes seem to be caused by "bindir=$(GPSD_PKGDIR)/usr/sbin",
with DESTDIR you wouldn't need these changes

>  endif
>  
>  ifdef PTXCONF_GPSD_GPSCAT

Regards Denis


Diehl Connectivity Solutions GmbH
Geschäftsführung: Horst Leonberger
Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
Nürnberg: HRB 32315
___________________________________________________________________________________________________

Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
- Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/

The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. 
- For general information on data protection and your respective rights please visit https://www.diehl.com/group/en/transparency-and-information-obligations/
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17
  2019-08-16  6:11   ` Denis OSTERLAND
@ 2019-08-16  9:00     ` Sascha Hauer
  0 siblings, 0 replies; 8+ messages in thread
From: Sascha Hauer @ 2019-08-16  9:00 UTC (permalink / raw)
  To: Denis OSTERLAND; +Cc: ptxdist

On Fri, Aug 16, 2019 at 06:11:46AM +0000, Denis OSTERLAND wrote:
> Hi,
> 
> 
> Am Donnerstag, den 15.08.2019, 14:56 +0200 schrieb Sascha Hauer:
> > From: Fabian Godehardt <fg@emlix.com>
> > 
> > This updates gpsd from 2.39 to 3.17. The build system has changed from
> > autotools to scons in the meantime, so there are quite some changes
> > necessary.
> > 
> > Signed-off-by: Fabian Godehardt <fg@emlix.com>
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  rules/gpsd.in   |  30 ++++++++----
> >  rules/gpsd.make | 120 ++++++++++++++++++++++++++++--------------------
> please remove old patches

I'll continue with your patch which seems to be closer to where we want
to go.

Regards
 Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation
  2019-08-15 12:56 [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation Sascha Hauer
  2019-08-15 12:56 ` [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17 Sascha Hauer
@ 2019-08-16  5:55 ` Denis OSTERLAND
  2019-08-16  8:58   ` Sascha Hauer
  1 sibling, 1 reply; 8+ messages in thread
From: Denis OSTERLAND @ 2019-08-16  5:55 UTC (permalink / raw)
  To: ptxdist

Hi,

is https://git.pengutronix.de/cgit/ptxdist/commit/?id=e59457c6d8ff080aca07352e7adb3ff73d976ae6
not working anymore?

Regards Denis

Am Donnerstag, den 15.08.2019, 14:56 +0200 schrieb Sascha Hauer:
> From: Andreas Schickedanz <andreas.schickedanz@emlix.com>
> 
> Without overwriting the paths the files will be installed in
> sysroot-host/local/bin,lib,man
> 
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  rules/host-python-scons.make | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/rules/host-python-scons.make b/rules/host-python-scons.make
> index efca45148..9c78e53fc 100644
> --- a/rules/host-python-scons.make
> +++ b/rules/host-python-scons.make
> @@ -29,5 +29,10 @@ HOST_PYTHON_SCONS_LICENSE_FILES	:= file://LICENSE.txt;md5=46ddf66004e5be5566367c
>  # ----------------------------------------------------------------------------
>  
>  HOST_PYTHON_SCONS_CONF_TOOL	:= python
> +HOST_PYTHON_SCONS_INSTALL_OPT  := install \
> +	--install-scripts=/bin \
> +	--install-lib=/lib/scons-$(HOST_PYTHON_SCONS_VERSION) \
> +	--install-platlib=/lib/scons-$(HOST_PYTHON_SCONS_VERSION) \
> +	--install-purelib=/lib/scons-$(HOST_PYTHON_SCONS_VERSION)
>  
>  # vim: syntax=make


Diehl Connectivity Solutions GmbH
Geschäftsführung: Horst Leonberger
Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
Nürnberg: HRB 32315
___________________________________________________________________________________________________

Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
- Informationen zum Datenschutz, insbesondere zu Ihren Rechten, erhalten Sie unter https://www.diehl.com/group/de/transparenz-und-informationspflichten/

The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited. 
- For general information on data protection and your respective rights please visit https://www.diehl.com/group/en/transparency-and-information-obligations/
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation
  2019-08-16  5:55 ` [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation Denis OSTERLAND
@ 2019-08-16  8:58   ` Sascha Hauer
  0 siblings, 0 replies; 8+ messages in thread
From: Sascha Hauer @ 2019-08-16  8:58 UTC (permalink / raw)
  To: Denis OSTERLAND; +Cc: ptxdist

On Fri, Aug 16, 2019 at 05:55:47AM +0000, Denis OSTERLAND wrote:
> Hi,
> 
> is https://git.pengutronix.de/cgit/ptxdist/commit/?id=e59457c6d8ff080aca07352e7adb3ff73d976ae6
> not working anymore?

Yes, it does. It's just not contained in the ptxdist-2019.01 I currently
use ;) With a newer ptxdist it works as expected.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-08-16  9:00 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-15 12:56 [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation Sascha Hauer
2019-08-15 12:56 ` [ptxdist] [PATCH 2/2] gpsd: Version bump to 3.17 Sascha Hauer
2019-08-15 13:05   ` Alexander Dahl
2019-08-15 13:18     ` Sascha Hauer
2019-08-16  6:11   ` Denis OSTERLAND
2019-08-16  9:00     ` Sascha Hauer
2019-08-16  5:55 ` [ptxdist] [PATCH 1/2] host-python-scons: Fix host-python-scons package installation Denis OSTERLAND
2019-08-16  8:58   ` Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox