* [ptxdist] [PATCH 0/2] gpsd: Allow logging
@ 2021-10-25 13:09 Alexander Dahl
2021-10-25 13:09 ` [ptxdist] [PATCH 1/2] Add macro 'noyes' as reverse of 'yesno' Alexander Dahl
2021-10-25 13:09 ` [ptxdist] [PATCH 2/2] gpsd: Make more prepare options configurable Alexander Dahl
0 siblings, 2 replies; 5+ messages in thread
From: Alexander Dahl @ 2021-10-25 13:09 UTC (permalink / raw)
To: ptxdist
Hei hei,
took me some time to realize the prepare option 'squelch' is responsible
for gpsd not logging anything at all … m(
Greets
Alex
Alexander Dahl (2):
Add macro 'noyes' as reverse of 'yesno'
gpsd: Make more prepare options configurable
doc/ref_make_macros.rst | 3 +++
rules/gpsd.in | 13 +++++++++++++
rules/gpsd.make | 10 +++++++---
rules/pre/000-option-disabled.make | 12 ++++++++++++
4 files changed, 35 insertions(+), 3 deletions(-)
base-commit: d8c7b6738c0de92b285111428a1905c34c6c62d7
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 1/2] Add macro 'noyes' as reverse of 'yesno'
2021-10-25 13:09 [ptxdist] [PATCH 0/2] gpsd: Allow logging Alexander Dahl
@ 2021-10-25 13:09 ` Alexander Dahl
2021-11-05 7:55 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-10-25 13:09 ` [ptxdist] [PATCH 2/2] gpsd: Make more prepare options configurable Alexander Dahl
1 sibling, 1 reply; 5+ messages in thread
From: Alexander Dahl @ 2021-10-25 13:09 UTC (permalink / raw)
To: ptxdist
This will be useful for some packages using scons.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
doc/ref_make_macros.rst | 3 +++
rules/pre/000-option-disabled.make | 12 ++++++++++++
2 files changed, 15 insertions(+)
diff --git a/doc/ref_make_macros.rst b/doc/ref_make_macros.rst
index ae65cb940..730687daf 100644
--- a/doc/ref_make_macros.rst
+++ b/doc/ref_make_macros.rst
@@ -673,6 +673,7 @@ Usage:
$(call ptx/wow, VARIABLE)
$(call ptx/wwo, VARIABLE)
$(call ptx/yesno, VARIABLE)
+ $(call ptx/noyes, VARIABLE)
$(call ptx/truefalse, VARIABLE)
$(call ptx/falsetrue, VARIABLE)
$(call ptx/onoff, VARIABLE)
@@ -694,6 +695,8 @@ These are useful for ``<PKG>_CONF_OPT`` variables, and expand as follows:
+--------------------+-------------------------------+---------------------------------+---------------------+
| ptx/yesno | ``yes`` | ``no`` | autoconf cache vars |
+--------------------+-------------------------------+---------------------------------+---------------------+
+| ptx/noyes | ``no`` | ``yes`` | scons |
++--------------------+-------------------------------+---------------------------------+---------------------+
| ptx/truefalse | ``true`` | ``false`` | meson |
+--------------------+-------------------------------+---------------------------------+---------------------+
| ptx/falsetrue | ``false`` | ``true`` | meson |
diff --git a/rules/pre/000-option-disabled.make b/rules/pre/000-option-disabled.make
index fa0e8a294..9a068b39c 100644
--- a/rules/pre/000-option-disabled.make
+++ b/rules/pre/000-option-disabled.make
@@ -146,6 +146,18 @@ $(call ptx/ifdef, $(1), yes, no)
endef
+#
+# $(call ptx/noyes, PTXCONF_SYMBOL) returns "no" or "yes"
+# depending on the symbol is defined or not
+#
+# $(call ptx/noyes, PTXCONF_SYMBOL)
+# $1
+#
+define ptx/noyes
+$(call ptx/ifdef, $(1), no, yes)
+endef
+
+
define ptx/config-foo
$(strip $(if $($(strip $(1))),
$(if $(call remove_quotes,$($(2))),
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* [ptxdist] [PATCH 2/2] gpsd: Make more prepare options configurable
2021-10-25 13:09 [ptxdist] [PATCH 0/2] gpsd: Allow logging Alexander Dahl
2021-10-25 13:09 ` [ptxdist] [PATCH 1/2] Add macro 'noyes' as reverse of 'yesno' Alexander Dahl
@ 2021-10-25 13:09 ` Alexander Dahl
2021-11-05 7:55 ` [ptxdist] [APPLIED] " Michael Olbrich
1 sibling, 1 reply; 5+ messages in thread
From: Alexander Dahl @ 2021-10-25 13:09 UTC (permalink / raw)
To: ptxdist
With squelch=no gpsd produces no logging output at all, not even when
using -D3 or higher as parameter.
Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
rules/gpsd.in | 13 +++++++++++++
rules/gpsd.make | 10 +++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/rules/gpsd.in b/rules/gpsd.in
index deebe6bbc..f14fcb7cc 100644
--- a/rules/gpsd.in
+++ b/rules/gpsd.in
@@ -68,6 +68,19 @@ config GPSD_USB
comment "Other options ---"
+config GPSD_DEBUG
+ bool
+ prompt "debug support"
+ help
+ Client debug support, debug information in build, install
+ gpsdebuginfo.
+
+config GPSD_LOGGING
+ bool
+ prompt "log/hexdump"
+ help
+ If unset: squelch gpsd_log/gpsd_hexdump to save cpu.
+
config GPSD_LIBGPSMM
bool
prompt "C++ class wrappers"
diff --git a/rules/gpsd.make b/rules/gpsd.make
index 75c497e63..c804cfebf 100644
--- a/rules/gpsd.make
+++ b/rules/gpsd.make
@@ -61,11 +61,12 @@ GPSD_CONF_OPT = \
aivdm=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_AIVDM) \
ashtech=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ASHTECH) \
bluez=$(call ptx/yesno, PTXCONF_GPSD_BLUEZ) \
- clientdebug=no \
+ clientdebug=$(call ptx/yesno, PTXCONF_GPSD_DEBUG) \
control_socket=yes \
coveraging=no \
dbus_export=$(call ptx/yesno, PTXCONF_GPSD_DBUS) \
- debug=no \
+ debug=$(call ptx/yesno, PTXCONF_GPSD_DEBUG) \
+ debug_opt=false \
earthmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EARTHMATE) \
evermore=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EVERMORE) \
force_global=yes \
@@ -111,7 +112,7 @@ GPSD_CONF_OPT = \
sirf=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SIRF) \
skytraq=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SKYTRAQ) \
socket_export=$(call ptx/yesno, PTXCONF_GPSD_SOCKET) \
- squelch=yes \
+ squelch=$(call ptx/noyes, PTXCONF_GPSD_LOGGING) \
superstar2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SUPERSTAR2) \
sysconfdir=/etc \
systemd=$(call ptx/yesno, PTXCONF_GPSD_SYSTEMD) \
@@ -184,6 +185,9 @@ endif
ifdef PTXCONF_GPSD_PYTHON
@$(call install_glob, gpsd, 0, 0, -, \
/usr/lib/python$(PYTHON3_MAJORMINOR), *.py)
+endif
+ifdef PTXCONF_GPSD_DEBUG
+ @$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsdebuginfo)
endif
@$(call install_finish, gpsd)
--
2.30.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [APPLIED] Add macro 'noyes' as reverse of 'yesno'
2021-10-25 13:09 ` [ptxdist] [PATCH 1/2] Add macro 'noyes' as reverse of 'yesno' Alexander Dahl
@ 2021-11-05 7:55 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2021-11-05 7:55 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Thanks, applied as 609370bb5cb27050bf7c90edacbc6145f2c50723.
Michael
[sent from post-receive hook]
On Fri, 05 Nov 2021 08:55:25 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> This will be useful for some packages using scons.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20211025130910.7257-2-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/doc/ref_make_macros.rst b/doc/ref_make_macros.rst
> index ae65cb9408cf..730687daf47e 100644
> --- a/doc/ref_make_macros.rst
> +++ b/doc/ref_make_macros.rst
> @@ -673,6 +673,7 @@ Usage:
> $(call ptx/wow, VARIABLE)
> $(call ptx/wwo, VARIABLE)
> $(call ptx/yesno, VARIABLE)
> + $(call ptx/noyes, VARIABLE)
> $(call ptx/truefalse, VARIABLE)
> $(call ptx/falsetrue, VARIABLE)
> $(call ptx/onoff, VARIABLE)
> @@ -694,6 +695,8 @@ These are useful for ``<PKG>_CONF_OPT`` variables, and expand as follows:
> +--------------------+-------------------------------+---------------------------------+---------------------+
> | ptx/yesno | ``yes`` | ``no`` | autoconf cache vars |
> +--------------------+-------------------------------+---------------------------------+---------------------+
> +| ptx/noyes | ``no`` | ``yes`` | scons |
> ++--------------------+-------------------------------+---------------------------------+---------------------+
> | ptx/truefalse | ``true`` | ``false`` | meson |
> +--------------------+-------------------------------+---------------------------------+---------------------+
> | ptx/falsetrue | ``false`` | ``true`` | meson |
> diff --git a/rules/pre/000-option-disabled.make b/rules/pre/000-option-disabled.make
> index fa0e8a294421..9a068b39ce83 100644
> --- a/rules/pre/000-option-disabled.make
> +++ b/rules/pre/000-option-disabled.make
> @@ -146,6 +146,18 @@ $(call ptx/ifdef, $(1), yes, no)
> endef
>
>
> +#
> +# $(call ptx/noyes, PTXCONF_SYMBOL) returns "no" or "yes"
> +# depending on the symbol is defined or not
> +#
> +# $(call ptx/noyes, PTXCONF_SYMBOL)
> +# $1
> +#
> +define ptx/noyes
> +$(call ptx/ifdef, $(1), no, yes)
> +endef
> +
> +
> define ptx/config-foo
> $(strip $(if $($(strip $(1))),
> $(if $(call remove_quotes,$($(2))),
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [ptxdist] [APPLIED] gpsd: Make more prepare options configurable
2021-10-25 13:09 ` [ptxdist] [PATCH 2/2] gpsd: Make more prepare options configurable Alexander Dahl
@ 2021-11-05 7:55 ` Michael Olbrich
0 siblings, 0 replies; 5+ messages in thread
From: Michael Olbrich @ 2021-11-05 7:55 UTC (permalink / raw)
To: ptxdist; +Cc: Alexander Dahl
Thanks, applied as 1de43bc97bee64fdece777c5498328722eede2f3.
Michael
[sent from post-receive hook]
On Fri, 05 Nov 2021 08:55:26 +0100, Alexander Dahl <ada@thorsis.com> wrote:
> With squelch=no gpsd produces no logging output at all, not even when
> using -D3 or higher as parameter.
>
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20211025130910.7257-3-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/gpsd.in b/rules/gpsd.in
> index deebe6bbc0c7..f14fcb7cc510 100644
> --- a/rules/gpsd.in
> +++ b/rules/gpsd.in
> @@ -68,6 +68,19 @@ config GPSD_USB
>
> comment "Other options ---"
>
> +config GPSD_DEBUG
> + bool
> + prompt "debug support"
> + help
> + Client debug support, debug information in build, install
> + gpsdebuginfo.
> +
> +config GPSD_LOGGING
> + bool
> + prompt "log/hexdump"
> + help
> + If unset: squelch gpsd_log/gpsd_hexdump to save cpu.
> +
> config GPSD_LIBGPSMM
> bool
> prompt "C++ class wrappers"
> diff --git a/rules/gpsd.make b/rules/gpsd.make
> index 75c497e632f7..c804cfebf2fb 100644
> --- a/rules/gpsd.make
> +++ b/rules/gpsd.make
> @@ -61,11 +61,12 @@ GPSD_CONF_OPT = \
> aivdm=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_AIVDM) \
> ashtech=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_ASHTECH) \
> bluez=$(call ptx/yesno, PTXCONF_GPSD_BLUEZ) \
> - clientdebug=no \
> + clientdebug=$(call ptx/yesno, PTXCONF_GPSD_DEBUG) \
> control_socket=yes \
> coveraging=no \
> dbus_export=$(call ptx/yesno, PTXCONF_GPSD_DBUS) \
> - debug=no \
> + debug=$(call ptx/yesno, PTXCONF_GPSD_DEBUG) \
> + debug_opt=false \
> earthmate=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EARTHMATE) \
> evermore=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_EVERMORE) \
> force_global=yes \
> @@ -111,7 +112,7 @@ GPSD_CONF_OPT = \
> sirf=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SIRF) \
> skytraq=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SKYTRAQ) \
> socket_export=$(call ptx/yesno, PTXCONF_GPSD_SOCKET) \
> - squelch=yes \
> + squelch=$(call ptx/noyes, PTXCONF_GPSD_LOGGING) \
> superstar2=$(call ptx/yesno, PTXCONF_GPSD_DRIVER_SUPERSTAR2) \
> sysconfdir=/etc \
> systemd=$(call ptx/yesno, PTXCONF_GPSD_SYSTEMD) \
> @@ -184,6 +185,9 @@ endif
> ifdef PTXCONF_GPSD_PYTHON
> @$(call install_glob, gpsd, 0, 0, -, \
> /usr/lib/python$(PYTHON3_MAJORMINOR), *.py)
> +endif
> +ifdef PTXCONF_GPSD_DEBUG
> + @$(call install_copy, gpsd, 0, 0, 0755, -, /usr/bin/gpsdebuginfo)
> endif
> @$(call install_finish, gpsd)
>
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-11-05 7:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-25 13:09 [ptxdist] [PATCH 0/2] gpsd: Allow logging Alexander Dahl
2021-10-25 13:09 ` [ptxdist] [PATCH 1/2] Add macro 'noyes' as reverse of 'yesno' Alexander Dahl
2021-11-05 7:55 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-10-25 13:09 ` [ptxdist] [PATCH 2/2] gpsd: Make more prepare options configurable Alexander Dahl
2021-11-05 7:55 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox