[ptxdist] [PATCH v1] berlios-can-utils: update to the latest git with j1939 support
Signed-off-by: Oleksij Rempel --- rules/berlios-can-utils.in | 15 +++ rules/berlios-can-utils.make | 30 +- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/rules/berlios-can-utils.in b/rules/berlios-can-utils.in index 1a175c92a..cbf5ebb3f 100644 --- a/rules/berlios-can-utils.in +++ b/rules/berlios-can-utils.in @@ -75,4 +75,19 @@ config BERLIOS_CAN_UTILS_SLCAND config BERLIOS_CAN_UTILS_SLCANPTY bool slcanpty +config BERLIOS_CAN_UTILS_JSPY + bool jspy + +config BERLIOS_CAN_UTILS_JSR + bool jsr + +config BERLIOS_CAN_UTILS_JACD + bool jacd + +config BERLIOS_CAN_UTILS_JCAT + bool jcat + +config BERLIOS_CAN_UTILS_TESTJ1939 + bool testj1939 + endif diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make index d8a7cff35..a65d8b7d9 100644 --- a/rules/berlios-can-utils.make +++ b/rules/berlios-can-utils.make @@ -16,20 +16,35 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) += berlios-can-utils # # Paths and names # -BERLIOS_CAN_UTILS_VERSION := 2014.01.0 -BERLIOS_CAN_UTILS_MD5 := f643449f6607688a9f4662a48bc91aa0 -BERLIOS_CAN_UTILS := can-utils-$(BERLIOS_CAN_UTILS_VERSION) +BERLIOS_CAN_UTILS_VERSION := 02b87eb1200 +BERLIOS_CAN_UTILS_MD5 := 56d79b50b3ce295f4af17e0b40136185 +BERLIOS_CAN_UTILS := canutils-$(BERLIOS_CAN_UTILS_VERSION) BERLIOS_CAN_UTILS_SUFFIX := tar.bz2 -BERLIOS_CAN_UTILS_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(BERLIOS_CAN_UTILS).$(BERLIOS_CAN_UTILS_SUFFIX) +BERLIOS_CAN_UTILS_URL := https://github.com/linux-can/can-utils.git;tag=$(BERLIOS_CAN_UTILS_VERSION) BERLIOS_CAN_UTILS_SOURCE := $(SRCDIR)/$(BERLIOS_CAN_UTILS).$(BERLIOS_CAN_UTILS_SUFFIX) BERLIOS_CAN_UTILS_DIR := $(BUILDDIR)/$(BERLIOS_CAN_UTILS) -BERLIOS_CAN_UTILS_LICENSE := unknown +BERLIOS_CAN_UTILS_LICENSE := GPL-2.0 + +# +# Extract (just create the 'configure' script on demand) +# + +$(STATEDIR)/berlios-can-utils.extract.post: $(STATEDIR)/autogen-tools + @$(call targetinfo) + @cd $(BERLIOS_CAN_UTILS_DIR) && [ -f configure ] || sh autogen.sh + @$(call world/patchin/post, BERLIOS_CAN_UTILS) + @$(call touch) # # Prepare # +BERLIOS_CAN_UTILS_CONF_ENV := \ + $(CROSS_ENV) \ + CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)" + BERLIOS_CAN_UTILS_CONF_TOOL:= autoconf +BERLIOS_CAN_UTILS_CONF_OPT := $(CROSS_AUTOCONF_USR) # # Target-Install @@ -59,6 +74,11 @@ BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_LOG2LONG) += /usr/bin/log2lon BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAN_ATTACH) += /usr/bin/slcan_attach BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCAND) += /usr/bin/slcand BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_SLCANPTY) += /usr/bin/slcanpty +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSPY) += /usr/bin/jspy +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JSR) += /usr/bin/jsr +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JACD) += /usr/bin/jacd +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_JCAT) += /usr/bin/jcat +BERLIOS_CAN_UTILS_INST-$(PTXCONF_BERLIOS_CAN_UTILS_TESTJ1939) += /usr/bin/testj1939 $(STATEDIR)/berlios-can-utils.targetinstall: @$(call targetinfo) -- 2.19.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] libpaper: Make the default paper configurable
For embedded systems it makes sense to be able to configure the default
paper name at build-time instead of run-time via environment variable.
The approach currently used in the rule file to configure the paper size
at build-time does not work, since using the environment variable
'PAPERSIZE' only works at run-time.
This change adds a new '--with-paper' configure switch, to be able to
overwrite the default 'letter' setting.
Signed-off-by: Juergen Borleis
---
.../0001-Make-the-default-paper-configurable.patch | 32 ++
patches/libpaper-1.1.24+nmu5/series| 4 +++
rules/libpaper.make| 9 +++---
3 files changed, 41 insertions(+), 4 deletions(-)
create mode 100644
patches/libpaper-1.1.24+nmu5/0001-Make-the-default-paper-configurable.patch
create mode 100644 patches/libpaper-1.1.24+nmu5/series
diff --git
a/patches/libpaper-1.1.24+nmu5/0001-Make-the-default-paper-configurable.patch
b/patches/libpaper-1.1.24+nmu5/0001-Make-the-default-paper-configurable.patch
new file mode 100644
index 0..8a71f9009
--- /dev/null
+++
b/patches/libpaper-1.1.24+nmu5/0001-Make-the-default-paper-configurable.patch
@@ -0,0 +1,32 @@
+From: Juergen Borleis
+Date: Tue, 1 Jan 2019 22:12:43 +0100
+Subject: [PATCH] Make the default paper configurable
+
+For embedded systems it makes sense to be able to configure the default
+paper name at build-time instead of run-time via environment variable.
+
+Signed-off-by: Juergen Borleis
+---
+ configure.ac | 9 -
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b6e937163775..b8744604629b 100644
+--- a/configure.ac
b/configure.ac
+@@ -30,7 +30,14 @@ AC_SUBST(PAPERCONFVAR)
+ AH_TEMPLATE(PAPERCONFVAR, [Environment variable that overrides the default
configuration file location])
+ AC_DEFINE_UNQUOTED(PAPERCONFVAR, "$PAPERCONFVAR")
+
+-PAPERSIZE=letter
++AC_MSG_CHECKING([which paper format name is the default one])
++AC_ARG_WITH([paper],
++ [AS_HELP_STRING([--with-paper=@<:@name@:>@], [build with default paper
name @<:@default=letter@:>@])],
++ [],
++ [with_paper=letter])
++AC_MSG_RESULT([${with_paper}])
++
++PAPERSIZE=${with_paper}
+ AC_SUBST(PAPERSIZE)
+ AH_TEMPLATE(PAPERSIZE, [Default paper size])
+ AC_DEFINE_UNQUOTED(PAPERSIZE, "$PAPERSIZE")
diff --git a/patches/libpaper-1.1.24+nmu5/series
b/patches/libpaper-1.1.24+nmu5/series
new file mode 100644
index 0..dcd68e553
--- /dev/null
+++ b/patches/libpaper-1.1.24+nmu5/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Make-the-default-paper-configurable.patch
+# e6daca9c3e99c1f166eba3ea6dc1961e - git-ptx-patches magic
diff --git a/rules/libpaper.make b/rules/libpaper.make
index 239118165..453a3aae1 100644
--- a/rules/libpaper.make
+++ b/rules/libpaper.make
@@ -33,13 +33,14 @@ LIBPAPER_LICENSE_FILES :=
file://COPYING;md5=0278281246c1e59af1ef0ae1784a4948
# Prepare
#
-LIBPAPER_CONF_ENV := \
- $(CROSS_ENV) \
- PAPERSIZE=$(PTXCONF_LIBPAPER_SIZE)
#
# autoconf
#
-LIBPAPER_CONF_TOOL := autoconf
+LIBPAPER_CONF_TOOL := autoconf
+LIBPAPER_CONF_OPT := \
+ $(CROSS_AUTOCONF_USR) \
+ --with-paper=$(PTXCONF_LIBPAPER_SIZE)
+
#
#
# Target-Install
--
2.11.0
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] host-pyhton-scons: add new package
This patch adds support for scons build system. https://scons.org/ Signed-off-by: Denis Osterland --- rules/host-python-scons.in | 6 ++ rules/host-python-scons.make | 35 +++ 2 files changed, 41 insertions(+) create mode 100644 rules/host-python-scons.in create mode 100644 rules/host-python-scons.make diff --git a/rules/host-python-scons.in b/rules/host-python-scons.in new file mode 100644 index 0..34bdddc0d --- /dev/null +++ b/rules/host-python-scons.in @@ -0,0 +1,6 @@ +## SECTION=hosttools_noprompt + +config HOST_PYTHON_SCONS + tristate + default y if ALLYES + select HOST_PYTHON diff --git a/rules/host-python-scons.make b/rules/host-python-scons.make new file mode 100644 index 0..8fd42a41f --- /dev/null +++ b/rules/host-python-scons.make @@ -0,0 +1,35 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Denis Osterland +# +# 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. +# + +# +# We provide this package +# +HOST_PACKAGES-$(PTXCONF_HOST_PYTHON_SCONS) += host-python-scons + +# +# Paths and names +# +HOST_PYTHON_SCONS_VERSION := 3.0.1 +HOST_PYTHON_SCONS_MD5 := b6a292e251b34b82c203b56cfa3968b3 +HOST_PYTHON_SCONS := python-scons-$(HOST_PYTHON_SCONS_VERSION) +HOST_PYTHON_SCONS_SUFFIX := tar.gz +HOST_PYTHON_SCONS_URL := $(call ptx/mirror, SF, scons/scons-$(HOST_PYTHON_SCONS_VERSION).$(HOST_PYTHON_SCONS_SUFFIX)) +HOST_PYTHON_SCONS_SOURCE := $(SRCDIR)/$(HOST_PYTHON_SCONS).$(HOST_PYTHON_SCONS_SUFFIX) +HOST_PYTHON_SCONS_DIR := $(HOST_BUILDDIR)/$(HOST_PYTHON_SCONS) +HOST_PYTHON_SCONS_LICENSE := MIT +HOST_PYTHON_SCONS_LICENSE_FILES:= file://LICENSE.txt;md5=46ddf66004e5be5566367cb525a66fc6 + +# +# Prepare +# + +HOST_PYTHON_SCONS_CONF_TOOL:= python + +# vim: syntax=make -- 2.20.1 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. 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. ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 0/2] update gpsd and switch to scons build system
gpsd uses scons build system now. The first patch adds scons as host tool. The second patch updates gpsd and uses scons to build it. Denis Osterland(2): host-pyhton-scons: add new package gpsd: version bump 2.39 -> 3.18.1 ...001-fix-core-compiling-with-nmea-disabled.patch | 29 - ...-breakage-if-some-drivers-are-not-enabled.patch | 48 .../0003-fix-a-simple-compile-error.patch | 28 - patches/gpsd-2.39/0004-Fix-autotool-bug.patch | 53 - ...-rely-on-AM_PATH_PYTHON-to-work-propperly.patch | 104 - patches/gpsd-2.39/0006-fix-parallel-build.patch| 38 --- patches/gpsd-2.39/autogen.sh | 4 - patches/gpsd-2.39/series | 9 -- ...Do-not-crash-when-not-building-python-man.patch | 54 + patches/gpsd-3.18.1/series | 4 + rules/gpsd.in | 33 +- rules/gpsd.make| 125 ++--- rules/host-python-scons.in | 6 + rules/host-python-scons.make | 35 ++ 14 files changed, 212 insertions(+), 358 deletions(-) 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. 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. ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 2/2] gpsd: version bump 2.39 -> 3.18.1
Use scons build system.
Add Kconfig switches for reconfigure, controlsend, group and ntpshmmon.
Remove PPS_ON_CTS.
Signed-off-by: Denis Osterland
---
...ix-core-compiling-with-nmea-disabled.patch | 29
...kage-if-some-drivers-are-not-enabled.patch | 48 ---
.../0003-fix-a-simple-compile-error.patch | 28
patches/gpsd-2.39/0004-Fix-autotool-bug.patch | 53
...-on-AM_PATH_PYTHON-to-work-propperly.patch | 104 ---
.../gpsd-2.39/0006-fix-parallel-build.patch | 38 --
patches/gpsd-2.39/autogen.sh | 4 -
patches/gpsd-2.39/series | 9 --
...t-crash-when-not-building-python-man.patch | 54
patches/gpsd-3.18.1/series| 4 +
rules/gpsd.in | 33 -
rules/gpsd.make | 125 --
12 files changed, 171 insertions(+), 358 deletions(-)
delete mode 100644
patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
delete mode 100644
patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
delete mode 100644 patches/gpsd-2.39/0003-fix-a-simple-compile-error.patch
delete mode 100644 patches/gpsd-2.39/0004-Fix-autotool-bug.patch
delete mode 100644
patches/gpsd-2.39/0005-just-rely-on-AM_PATH_PYTHON-to-work-propperly.patch
delete mode 100644 patches/gpsd-2.39/0006-fix-parallel-build.patch
delete mode 100755 patches/gpsd-2.39/autogen.sh
delete mode 100644 patches/gpsd-2.39/series
create mode 100644
patches/gpsd-3.18.1/0001-SConstruct-Do-not-crash-when-not-building-python-man.patch
create mode 100644 patches/gpsd-3.18.1/series
diff --git a/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
b/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
deleted file mode 100644
index e3e166be3..0
--- a/patches/gpsd-2.39/0001-fix-core-compiling-with-nmea-disabled.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Luotao Fu
-Date: Sun, 30 Oct 2011 22:33:40 +0100
-Subject: [PATCH] fix core compiling with nmea disabled
-
-struct nmea is only defined in the driver union if NMEA_ENABLED is set.
-libpgsd_core however acquires if the ignore_trailing_edge in nmea is set
-or not carelessly if NMEA_ENABLED is set. Add an additional ifdef of
-NMEA_ENABLE to fix this.
-
-Signed-off-by: Luotao Fu
-# 20110222 wsa: fixed in master meanwhile
-
- libgpsd_core.c |2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libgpsd_core.c b/libgpsd_core.c
-index 28f787d..4109369 100644
a/libgpsd_core.c
-+++ b/libgpsd_core.c
-@@ -206,7 +206,7 @@ static /*@null@*/void *gpsd_ppsmonitor(void *arg)
- } else if (cycle > 999000 && cycle < 1001000 ) {
- /* looks like PPS pulse or square wave */
- if (duration > 499000 && duration < 501000
--#ifdef GPSCLOCK_ENABLE
-+#if defined(NMEA_ENABLE) && defined(GPSCLOCK_ENABLE)
- && session->driver.nmea.ignore_trailing_edge
- #endif /* GPSCLOCK_ENABLE */
- ) {
diff --git
a/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
b/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
deleted file mode 100644
index b39161ec1..0
---
a/patches/gpsd-2.39/0002-fix-link-breakage-if-some-drivers-are-not-enabled.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Luotao Fu
-Date: Thu, 23 Apr 2009 18:18:54 +0200
-Subject: [PATCH] fix link breakage if some drivers are not enabled
-
-rtcm*_unpack and rtcm*_dump functions are only declared if the rtcm drivers are
-enabled during configuration. The same for aivdm. If these drivers are not
-enabled, linking will fail due to unknow reference. Add some ifdefs to avoid
-this. This is ugly ifdef hell. It'd be way eleganter to change the structures
in
-driver code and put some function pointer checking in here. Due to lack of time
-I only did this quick hack. Better ideas are highly welcome.
-
-Signed-off-by: Luotao Fu
-# 20110222 wsa: fixed in master meanwhile. Like this.
-
- gpsdecode.c |6 ++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git a/gpsdecode.c b/gpsdecode.c
-index ffe898b..e18c698 100644
a/gpsdecode.c
-+++ b/gpsdecode.c
-@@ -57,19 +57,25 @@ static void decode(FILE *fpin, FILE *fpout)
- else if (lexer.type == COMMENT_PACKET)
- continue;
- else if (lexer.type == RTCM2_PACKET) {
-+#if defined(RTCM104V2_ENABLE)
- rtcm2_unpack(, (char *)lexer.isgps.buf);
- rtcm2_dump(, buf, sizeof(buf));
- (void)fputs(buf, fpout);
-+#endif
- }
- else if (lexer.type == RTCM3_PACKET) {
-+#if defined(RTCM104V3_ENABLE)
- rtcm3_unpack(, (char *)lexer.outbuffer);
- rtcm3_dump(, stdout);
-+#endif
- }
- else if (lexer.type == AIVDM_PACKET) {
-+#if defined(aivdm_dump)
- /*@ -uniondef */
- if (aivdm_decode((char *)lexer.outbuffer,
