[ptxdist] [PATCH v2] 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..aad9f5a80
--- /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..34342d1f9295 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([default-paper],
++ [AS_HELP_STRING([--with-default-paper=@<:@name@:>@], [build with
default paper name @<:@default=letter@:>@])],
++ [],
++ [with_default_paper=letter])
++AC_MSG_RESULT([${with_default_paper}])
++
++PAPERSIZE=${with_default_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..45cd946cc 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-default-paper=$(PTXCONF_LIBPAPER_SIZE)
+
#
#
# Target-Install
--
2.11.0
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [PATCH v2] libpaper: Make the default paper configurable
Change since v1: - instead of '--with-paper' the new options is now called '--with-default-paper' like Roland suggested. Signed-off-by: Juergen Borleis ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2 0/2] update gpsd and switch to scons build system
v1 -> v2: correct dependency HOST_PYTHON -> HOST_SYSTEM_PYTHON 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 v2 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,
[ptxdist] [PATCH v2 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..0343fc8e1 --- /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_SYSTEM_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
Re: [ptxdist] [PATCH 1/2] host-pyhton-scons: add new package
Am Montag, den 07.01.2019, 16:16 +0100 schrieb Michael Olbrich: > On Fri, Jan 04, 2019 at 08:11:58AM +, Denis OSTERLAND wrote: > > > > + > > +config HOST_PYTHON_SCONS > > + tristate > > + default y if ALLYES > > + select HOST_PYTHON > No. HOST_PYTHON is only there to build the target Python. Use > HOST_SYSTEM_PYTHON instead. > > Michael Okay, will fix in v2 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. 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
Re: [ptxdist] [REGRESSION] a73b00a breaks ptxdist nfsroot
On Mon, Jan 07, 2019 at 06:35:01PM +0100, Uwe Kleine-König wrote:
> with a project using ptxdist-2018.11.0 I get the following:
>
> $ ptxdist nfsroot
>
> ptxdist: error: glib is not a package or not selected
>
> make: *** [ptxd_make_nfsd] Error 1
>
> because ptx_packages_selected is empty.
>
> When I revert
>
> a73b00a71955 ("ptxd_do_xpkg_map: validate package list")
>
> it works fine. I guess world/image/env/impl must somehow be called
> before nfsroot calls ptxd_do_xpkg_map, but that's way to deep into
> ptxdist for me, so I let you work out the right fix. :-)
This should be fixed in ptxdist-2018.12.0 with
403d1f49c78b ("ptxd_make_image_common: set ptx_packages_selected for
image/env").
Michael
--
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- |
___
ptxdist mailing list
ptxdist@pengutronix.de
[ptxdist] [REGRESSION] a73b00a breaks ptxdist nfsroot
Hello,
with a project using ptxdist-2018.11.0 I get the following:
$ ptxdist nfsroot
ptxdist: error: glib is not a package or not selected
make: *** [ptxd_make_nfsd] Error 1
because ptx_packages_selected is empty.
When I revert
a73b00a71955 ("ptxd_do_xpkg_map: validate package list")
it works fine. I guess world/image/env/impl must somehow be called
before nfsroot calls ptxd_do_xpkg_map, but that's way to deep into
ptxdist for me, so I let you work out the right fix. :-)
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König|
Industrial Linux Solutions | http://www.pengutronix.de/ |
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v1] berlios-can-utils: update to the latest git with j1939 support
On Fri, Jan 04, 2019 at 02:52:41PM +0100, Oleksij Rempel wrote: > 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_VERSION := v2018.02.0-37-g02b87eb1200f > +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) No. Just create patches/canutils-/autogen.sh instead. > > # > > # Prepare > # > > > +BERLIOS_CAN_UTILS_CONF_ENV := \ > + $(CROSS_ENV) \ > + CPPFLAGS="-I$(KERNEL_HEADERS_INCLUDE_DIR) $(CROSS_CPPFLAGS)" BERLIOS_CAN_UTILS_CPPFLAGS := -isystem $(KERNEL_HEADERS_INCLUDE_DIR) Michael > + > 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 -- 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- | ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 1/2] host-pyhton-scons: add new package
On Fri, Jan 04, 2019 at 08:11:58AM +, Denis OSTERLAND wrote: > 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 No. HOST_PYTHON is only there to build the target Python. Use HOST_SYSTEM_PYTHON instead. Michael > 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 -- 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- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] bridge-utils: version bump 1.5 -> 1.6
- version bump
- readd with-linux-headers invalid path to avoid using the default
search path, which may pick up headers from the build host
Signed-off-by: Lucas Stach
---
...-linux-in6.h-to-build-with-newer-kernel-h.patch | 24 --
patches/bridge-utils-1.5/series| 4
.../autogen.sh | 0
rules/bridge-utils.make| 12 ---
4 files changed, 9 insertions(+), 31 deletions(-)
delete mode 100644
patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
delete mode 100644 patches/bridge-utils-1.5/series
rename patches/{bridge-utils-1.5 => bridge-utils-1.6}/autogen.sh (100%)
diff --git
a/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
b/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
deleted file mode 100644
index 602ba6dcf792..
---
a/patches/bridge-utils-1.5/0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich
-Date: Tue, 17 Dec 2013 10:19:29 +0100
-Subject: [PATCH] add '#include ' to build with newer kernel
- headers
-
-See also: https://lkml.org/lkml/2013/1/13/116
-
-Signed-off-by: Michael Olbrich
- libbridge/libbridge.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
-index 39964f2..aeb094d 100644
a/libbridge/libbridge.h
-+++ b/libbridge/libbridge.h
-@@ -21,6 +21,7 @@
-
- #include
- #include
-+#include
- #include
-
- /* defined in net/if.h but that conflicts with linux/if.h... */
diff --git a/patches/bridge-utils-1.5/series b/patches/bridge-utils-1.5/series
deleted file mode 100644
index 064d4211c808..
--- a/patches/bridge-utils-1.5/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-add-include-linux-in6.h-to-build-with-newer-kernel-h.patch
-# 5ef46a2f4ea5c1f3c53698f8b7251c59 - git-ptx-patches magic
diff --git a/patches/bridge-utils-1.5/autogen.sh
b/patches/bridge-utils-1.6/autogen.sh
similarity index 100%
rename from patches/bridge-utils-1.5/autogen.sh
rename to patches/bridge-utils-1.6/autogen.sh
diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make
index f83f0a3ac3fe..57fe18dd931f 100644
--- a/rules/bridge-utils.make
+++ b/rules/bridge-utils.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_BRIDGE_UTILS) += bridge-utils
#
# Paths and names
#
-BRIDGE_UTILS_VERSION := 1.5
-BRIDGE_UTILS_MD5 := ec7b381160b340648dede58c31bb2238
+BRIDGE_UTILS_VERSION := 1.6
+BRIDGE_UTILS_MD5 := f369e90e85e4bb46baa26a7b9d66b578
BRIDGE_UTILS := bridge-utils-$(BRIDGE_UTILS_VERSION)
BRIDGE_UTILS_SUFFIX:= tar.gz
-BRIDGE_UTILS_URL := $(call ptx/mirror, SF,
bridge/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX))
+BRIDGE_UTILS_URL :=
https://www.kernel.org/pub/linux/utils/net/bridge-utils/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
BRIDGE_UTILS_SOURCE:= $(SRCDIR)/$(BRIDGE_UTILS).$(BRIDGE_UTILS_SUFFIX)
BRIDGE_UTILS_DIR := $(BUILDDIR)/$(BRIDGE_UTILS)
BRIDGE_UTILS_LICENSE := GPL-2.0-or-later
@@ -36,6 +36,12 @@ BRIDGE_UTILS_LICENSE := GPL-2.0-or-later
#
BRIDGE_UTILS_CONF_TOOL := autoconf
+# Set with-linux-headers to something that doesn't exist to avoid the default
+# path picking up a path from the build host.
+BRIDGE_UTILS_AUTOCONF := \
+ $(CROSS_AUTOCONF_USR) \
+ --with-linux-headers=/this/path/must/not/exist
+
#
# Target-Install
#
--
2.11.0
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH] host-autotools-automake: version bump 1.5.1 -> 1.6.1
Hello, On Tue, May 15, 2018 at 10:53:54AM +, Baeuerle, Florian wrote: > Am Dienstag, den 15.05.2018, 08:30 +0200 schrieb Uwe Kleine-König: > > Hello, > > > > On Mon, May 14, 2018 at 10:54:56AM +, Baeuerle, Florian wrote: > > > Removed patch: > > > > > > - 0001-disable-manpages.patch: > > > Build succeeds without this patch. > > > > the problem that was fixed with this patch maybe only happened on Arch, > > at least that's what reading through > > 5d107ecae118ac3dd49fdf10c54901eb0a4c3bdf suggests. Adding Clemens Gruber > > to the recipients, who authored the patch. Maybe he can test/comment? > > If the problem only occurred on Arch Linux, then I can confirm it's no > longer occurring - I've built my ptxdist project successfully on Arch Linux > with this patch (which removed the patch in question). > > Did some further investigation. > > Apparently, help2man was updated a while after the automake v1.15.1 release: > https://git.savannah.gnu.org/cgit/automake.git/commit/doc/help2man?id=9322f409a957f153b38ff37ba79ddf4c19cff6ca > > The previous help2man v1.40.8 was from 2012: > https://salsa.debian.org/bod/help2man/commit/4efbcca2dc796a5f9bf2797905fc9e6bee6a6afc FTR: I just got a failure to build on Centos 7.5.1804 which was fixed by the patch that got dropped here. Didn't debug further yet. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | http://www.pengutronix.de/ | ___ ptxdist mailing list ptxdist@pengutronix.de
