Re: [ptxdist] [PATCH v2] tf-a: new package for ARM trusted firmware A
On Mon, Feb 17, 2020 at 05:33:57PM +0100, Guillermo Rodriguez Garcia wrote: > El lun., 17 feb. 2020 a las 17:26, Michael Tretter > () escribió: > > > > On Wed, 12 Feb 2020 17:40:33 +0100, Ahmad Fatoum wrote: > > > Trusted Firmware-A (TF-A) is a reference implementation of secure world > > > software for Arm A-Profile architectures (Armv8-A and Armv7-A). > > > > I successfully built the TF-A BL31 for the ZynqMP using this rule. > > > > However, I saw that the TF-A build uses the current git commitish for > > BUILD_STRING, which will be written into the binary. If I build the > > TF-A with this rule, this ends up to be the commitish of the BSP. I'm > > not sure if I actually want this, but I don't know what to put there > > instead. > > Since we finally agreed to keep TF_A_EXTRA_ARGS in the final TF-A rule > files, you can actually set BUILD_STRING to anything you want. Just > include BUILD_STRING=whatever in the TF_A_EXTRA_ARGS parameter. There should always be a default BUILD_STRING that does not depend on the BSP commit-ish. $(TF_A_VERSION) probably. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 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 v2] tf-a: new package for ARM trusted firmware A
Hi Michael, El lun., 17 feb. 2020 a las 17:26, Michael Tretter () escribió: > > On Wed, 12 Feb 2020 17:40:33 +0100, Ahmad Fatoum wrote: > > Trusted Firmware-A (TF-A) is a reference implementation of secure world > > software for Arm A-Profile architectures (Armv8-A and Armv7-A). > > I successfully built the TF-A BL31 for the ZynqMP using this rule. > > However, I saw that the TF-A build uses the current git commitish for > BUILD_STRING, which will be written into the binary. If I build the > TF-A with this rule, this ends up to be the commitish of the BSP. I'm > not sure if I actually want this, but I don't know what to put there > instead. Since we finally agreed to keep TF_A_EXTRA_ARGS in the final TF-A rule files, you can actually set BUILD_STRING to anything you want. Just include BUILD_STRING=whatever in the TF_A_EXTRA_ARGS parameter. Best, Guillermo > > Michael > > > > > Cc: Alejandro Vazquez > > Signed-off-by: Rouven Czerwinski > > Signed-off-by: Ahmad Fatoum > > --- > > v1 -> v2: > > - Made TF_A_ARCH_MAJOR configurable to support 32 bit ARMv8 (Guillermo) > > - Replaces stm32mp-specific TF_A_DTB with TF_A_EXTRA_ARGS to contain > >all board/vendor specific options > > - removed reference to no longer existing CREDITS file > > - removed TF_A_MAKE_OPT contents that are set elsewhere > > - reduced uses of += in favor of directly appending to the string > > - delete old build directory in prepare instead of compile > > - use default compile stage (Guillermo) > > - install artifacts to sysroot /usr/lib/firmware in install stage > > - install artifacts to IMAGEDIR in targetinstall > > - fix clean stage to delete proper artifacts > > --- > > platforms/tf-a.in | 138 ++ > > rules/tf-a.make | 114 ++ > > 2 files changed, 252 insertions(+) > > create mode 100644 platforms/tf-a.in > > create mode 100644 rules/tf-a.make > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Guillermo Rodriguez Garcia guille.rodrig...@gmail.com ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v2] tf-a: new package for ARM trusted firmware A
On Wed, 12 Feb 2020 17:40:33 +0100, Ahmad Fatoum wrote: > Trusted Firmware-A (TF-A) is a reference implementation of secure world > software for Arm A-Profile architectures (Armv8-A and Armv7-A). I successfully built the TF-A BL31 for the ZynqMP using this rule. However, I saw that the TF-A build uses the current git commitish for BUILD_STRING, which will be written into the binary. If I build the TF-A with this rule, this ends up to be the commitish of the BSP. I'm not sure if I actually want this, but I don't know what to put there instead. Michael > > Cc: Alejandro Vazquez > Signed-off-by: Rouven Czerwinski > Signed-off-by: Ahmad Fatoum > --- > v1 -> v2: > - Made TF_A_ARCH_MAJOR configurable to support 32 bit ARMv8 (Guillermo) > - Replaces stm32mp-specific TF_A_DTB with TF_A_EXTRA_ARGS to contain >all board/vendor specific options > - removed reference to no longer existing CREDITS file > - removed TF_A_MAKE_OPT contents that are set elsewhere > - reduced uses of += in favor of directly appending to the string > - delete old build directory in prepare instead of compile > - use default compile stage (Guillermo) > - install artifacts to sysroot /usr/lib/firmware in install stage > - install artifacts to IMAGEDIR in targetinstall > - fix clean stage to delete proper artifacts > --- > platforms/tf-a.in | 138 ++ > rules/tf-a.make | 114 ++ > 2 files changed, 252 insertions(+) > create mode 100644 platforms/tf-a.in > create mode 100644 rules/tf-a.make ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] strongswan: Fix swanctl build without systemd
Fix compile error when selecting swanctl without systemd. Need either charon-systemd or charon plugin for strongswan. Signed-off-by: Lars Pedersen --- rules/strongswan.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/strongswan.make b/rules/strongswan.make index 7e9f44e45..4ec183ae4 100644 --- a/rules/strongswan.make +++ b/rules/strongswan.make @@ -183,7 +183,7 @@ STRONGSWAN_CONF_OPT := \ --disable-test-vectors \ --enable-updown \ --disable-aikgen \ - --$(call ptx/disen, PTXCONF_STRONGSWAN_SWANCTL)-charon \ + --$(call ptx/disen, PTXCONF_STRONGSWAN_SYSTEMD_UNIT)-charon \ --disable-cmd \ --disable-conftest \ --disable-fast \ -- 2.24.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v3] strongswan: Version bump 5.6.1 -> 5.8.2
I'll will create a patch that proposes a fix. I found out that strongswan always need either charon (enable-charon option) or charon-systemd(enable-systemd option). So the bug was that both were disabled when using swanctl without systemd. /Lars Pedersen. On Mon, 17 Feb 2020 at 11:19, Michael Olbrich wrote: > So, I merged this. But now building fails because swanctl needs > src/libcharon/plugins/vici/libvici.la and that is not built when systemd is > disabled. I think the internal handling for libcharon is broken. What do > you think is the correct fix here? > > Michael > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v1] update berlios-can-utils to the version v2020.02.04
Signed-off-by: Oleksij Rempel
---
.../autogen.sh| 0
rules/berlios-can-utils.make | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename patches/{canutils-v2018.02.0-96-ga8d4827 =>
canutils-v2020.02.04}/autogen.sh (100%)
diff --git a/patches/canutils-v2018.02.0-96-ga8d4827/autogen.sh
b/patches/canutils-v2020.02.04/autogen.sh
similarity index 100%
rename from patches/canutils-v2018.02.0-96-ga8d4827/autogen.sh
rename to patches/canutils-v2020.02.04/autogen.sh
diff --git a/rules/berlios-can-utils.make b/rules/berlios-can-utils.make
index c1cdb200d..8cc51a40d 100644
--- a/rules/berlios-can-utils.make
+++ b/rules/berlios-can-utils.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BERLIOS_CAN_UTILS) += berlios-can-utils
#
# Paths and names
#
-BERLIOS_CAN_UTILS_VERSION := v2018.02.0-96-ga8d4827
-BERLIOS_CAN_UTILS_MD5 := 8d82ec5a1cf593845e7ff316ed3134a4
+BERLIOS_CAN_UTILS_VERSION := v2020.02.04
+BERLIOS_CAN_UTILS_MD5 := 5ca2e7b840bb5fbe8a30967e076dc16e
BERLIOS_CAN_UTILS := canutils-$(BERLIOS_CAN_UTILS_VERSION)
BERLIOS_CAN_UTILS_SUFFIX := tar.gz
BERLIOS_CAN_UTILS_URL :=
https://github.com/linux-can/can-utils/archive/$(BERLIOS_CAN_UTILS_VERSION).$(BERLIOS_CAN_UTILS_SUFFIX)
--
2.25.0
___
ptxdist mailing list
ptxdist@pengutronix.de
Re: [ptxdist] [PATCH v5 3/3] open62541: new package
On Mon, Feb 17, 2020 at 10:50:12AM +0100, Roland Hieber wrote: > On Fri, Feb 14, 2020 at 01:50:23PM +0100, Michael Olbrich wrote: > > On Wed, Feb 05, 2020 at 11:42:41AM +0100, Ulrich Ölmann wrote: > > [...] > > > > diff --git a/rules/open62541.make b/rules/open62541.make > > > new file mode 100644 > > > index ..62e030ed3752 > > > --- /dev/null > > > +++ b/rules/open62541.make > > > @@ -0,0 +1,140 @@ > > > +# -*-makefile-*- > > > +# > > > +# Copyright (C) 2018 by Robert Schwebel > > > +# Copyright (C) 2019 by Bjoern Esser > > > +# > > > +# 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 > > > +# > > > +PACKAGES-$(PTXCONF_OPEN62541) += open62541 > > > + > > > +# > > > +# Paths and names > > > +# > > > +OPEN62541_VERSION:= 1.0 > > > +OPEN62541_MD5:= b8e02d7310e8b48faf52efc539fa9496 > > > +OPEN62541:= open62541-$(OPEN62541_VERSION) > > > +OPEN62541_SUFFIX := tar.gz > > > +OPEN62541_URL:= > > > https://github.com/open62541/open62541/archive/v$(OPEN62541_VERSION)/$(OPEN62541).$(OPEN62541_SUFFIX) > > > +OPEN62541_SOURCE := $(SRCDIR)/$(OPEN62541).$(OPEN62541_SUFFIX) > > > +OPEN62541_DIR:= $(BUILDDIR)/$(OPEN62541) > > > +OPEN62541_LICENSE:= MPL-2.0 > > > +OPEN62541_LICENSE_FILES := > > > file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad > > > + > > > +OPEN62541_MDNSD_VERSION := > > > 4bd993e0fdd06d54c8fd0b8f416cda6a8db18585 > > > +OPEN62541_MDNSD_MD5 := 0961fc8dc253753ec8ea157104671498 > > > +OPEN62541_MDNSD_URL := > > > https://github.com/Pro/mdnsd/archive/$(OPEN62541_MDNSD_VERSION)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz > > > +OPEN62541_MDNSD_SOURCE := > > > $(SRCDIR)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz > > > > The suffix deserves a separate variable. > > I'm curious why, is it used by anything other than the URL? Well, having a _VERSION makes the diff for updates easier to read. _SOURCE and _URL and _MD5 are always needed. And now that I look closer, OPEN62541_MDNSD should be set as well. This and _SUFFIX make it clearer that _SOURCE and URL are in sync. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 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 v3] strongswan: Version bump 5.6.1 -> 5.8.2
On Mon, Feb 03, 2020 at 09:38:20AM +0100, Lars Pedersen wrote: > On Sat, 1 Feb 2020 at 07:47, Michael Olbrich wrote: > > > +ifdef PTXCONF_STRONGSWAN_SWANCTL > > > + @$(call install_lib, strongswan, 0, 0, 0644, libvici) > > > + @$(call install_tree, strongswan, 0, 0, -, /etc/strongswan.d) > > > + @$(call install_alternative, strongswan, 0, 0, 0644, > > > /etc/swanctl/swanctl.conf) > > > + @$(call install_alternative, strongswan, 0, 0, 750, > > > /etc/swanctl/conf.d) > > > > /etc/swanctl/conf.d does not exist here. From the naming, I expect this to > > be a directory to extend swanctl.conf. If that is the case, then just > > remove this here. > > If someone needs this instead of overwriting swanctl.conf, then an > > auxiliary package can be used. > > > > I can do a local fixup, if this is ok with you. No need to resend. > > > > Michael > > You are correct that the conf.d directory only extends swanctl.conf. > > https://wiki.strongswan.org/projects/strongswan/wiki/SwanctlDirectory > "conf.d Config snippets, included via include conf.d/*.conf in the > default swanctl.conf file since 5.6.0" > > So your fixup sounds fine by me. So, I merged this. But now building fails because swanctl needs src/libcharon/plugins/vici/libvici.la and that is not built when systemd is disabled. I think the internal handling for libcharon is broken. What do you think is the correct fix here? Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 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] syslogng: update to 3.25.1
On Thu, Feb 13, 2020 at 06:22:08PM +0100, Matthias Schiffer wrote:
> Update and move out of staging. The new version adds compatiblity with
> OpenSSL 1.1.x and switches to Python 3.
>
> The AMQP and MongoDB destinations are removed, they were never buildable
> without additional packages not available in plain PTXdist.
>
> A simple replacement for the old systemd unit is added, as the new version
> only provides an instanced unit which cannot be linked as syslog.service
> (which is necessary to use syslog-ng as the default system logger by
> enabling ForwardToSyslog in journald.conf).
>
> Signed-off-by: Matthias Schiffer
And it seems to build its own version of libjson-c.so.3 that is never
installed. Maybe --with-jsonc=system and a dependency? Or disable it
entirely.
Michael
> ---
> projectroot/etc/syslog-ng.conf| 6 +++--
> .../usr/lib/systemd/system/syslog-ng.service | 20 +
> rules/syslogng.in | 22 ++-
> rules/syslogng.make | 18 +--
> 4 files changed, 37 insertions(+), 29 deletions(-)
> create mode 100644 projectroot/usr/lib/systemd/system/syslog-ng.service
>
> diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
> index 254aecfd2..0235b9857 100644
> --- a/projectroot/etc/syslog-ng.conf
> +++ b/projectroot/etc/syslog-ng.conf
> @@ -1,13 +1,15 @@
> #
> -# syslog-ng configuration
> +# syslog-ng configuration
> #
>
> +@version: 3.25
> +
> #
> # Options
> #
>
> # sync every 0 lines
> -options { long_hostnames(off); sync(0); };
> +options { chain_hostnames(off); flush_lines(0); };
>
> #
> # Sources
> diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service
> b/projectroot/usr/lib/systemd/system/syslog-ng.service
> new file mode 100644
> index 0..6bf591efd
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
> @@ -0,0 +1,20 @@
> +[Unit]
> +Description=System Logger Daemon
> +Documentation=man:syslog-ng(8)
> +Conflicts=emergency.service emergency.target
> +Requires=syslog.socket
> +Wants=network.target network-online.target
> +After=network.target network-online.target
> +
> +[Service]
> +Type=notify
> +ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
> +ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf
> --control /var/run/syslog-ng.ctl --persist-file
> /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid
> +ExecReload=/bin/kill -HUP $MAINPID
> +StandardOutput=journal
> +StandardError=journal
> +Restart=on-failure
> +
> +[Install]
> +Alias=syslog.service
> +WantedBy=multi-user.target
> diff --git a/rules/syslogng.in b/rules/syslogng.in
> index 3b1af844b..29d26e72a 100644
> --- a/rules/syslogng.in
> +++ b/rules/syslogng.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=networking
> +## SECTION=networking
> # syslog-ng configuration
>
> menuconfig SYSLOGNG
> @@ -9,7 +7,7 @@ menuconfig SYSLOGNG
> select EVENTLOG
> select GLIB
> select OPENSSL
> - select PYTHON if SYSLOGNG_PYTHON_DESTINATION
> + select PYTHON3 if SYSLOGNG_PYTHON_DESTINATION
> select LIBC_NSL
> select LIBC_RT
> select LIBNET if SYSLOGNG_SPOOF_SOURCE
> @@ -19,10 +17,6 @@ menuconfig SYSLOGNG
> help
> The next generation syslog daemon.
>
> - STAGING: remove in ptxdist-2020.01.0
> - Fails to build with OpenSSL 1.1.x. Update to a new version is
> - needed.
> -
> if SYSLOGNG
>
> config SYSLOGNG_TCP_WRAPPER
> @@ -46,18 +40,6 @@ config SYSLOGNG_SPOOF_SOURCE
> destinations though the original message can be
> received by TCP as well.
>
> -config SYSLOGNG_AMQP_DESTINATION
> - bool
> - prompt "support the AMQP destination"
> - help
> - Enables the ability to publish AMQP messages.
> -
> -config SYSLOGNG_MONGODB_DESTINATION
> - bool
> - prompt "support the MongoDB destination"
> - help
> - Enables the ability to send messages to a MongoDB database.
> -
> config SYSLOGNG_PYTHON_DESTINATION
> bool
> prompt "support the python destination"
> diff --git a/rules/syslogng.make b/rules/syslogng.make
> index 114f72cef..4025fc0fa 100644
> --- a/rules/syslogng.make
> +++ b/rules/syslogng.make
> @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
> #
> # Paths and names
> #
> -SYSLOGNG_VERSION := 3.7.3
> -SYSLOG_LIBVERSION:= 3.7
> -SYSLOGNG_MD5 := 803d61a713d6d41a973942d417fec999
> +SYSLOGNG_VERSION := 3.25.1
> +SYSLOG_LIBVERSION:= 3.25
> +SYSLOGNG_MD5 := 07c2ebb712ddacd201b24b265b857b0d
> SYSLOGNG := syslog-ng-$(SYSLOGNG_VERSION)
> SYSLOGNG_SUFFIX := tar.gz
> SYSLOGNG_URL :=
> https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
> @@ -32,7 +32,7 @@ SYSLOGNG_LICENSE:=
Re: [ptxdist] [PATCH v5 3/3] open62541: new package
On Fri, Feb 14, 2020 at 01:50:23PM +0100, Michael Olbrich wrote: > On Wed, Feb 05, 2020 at 11:42:41AM +0100, Ulrich Ölmann wrote: [...] > > diff --git a/rules/open62541.make b/rules/open62541.make > > new file mode 100644 > > index ..62e030ed3752 > > --- /dev/null > > +++ b/rules/open62541.make > > @@ -0,0 +1,140 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2018 by Robert Schwebel > > +# Copyright (C) 2019 by Bjoern Esser > > +# > > +# 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 > > +# > > +PACKAGES-$(PTXCONF_OPEN62541) += open62541 > > + > > +# > > +# Paths and names > > +# > > +OPEN62541_VERSION := 1.0 > > +OPEN62541_MD5 := b8e02d7310e8b48faf52efc539fa9496 > > +OPEN62541 := open62541-$(OPEN62541_VERSION) > > +OPEN62541_SUFFIX := tar.gz > > +OPEN62541_URL := > > https://github.com/open62541/open62541/archive/v$(OPEN62541_VERSION)/$(OPEN62541).$(OPEN62541_SUFFIX) > > +OPEN62541_SOURCE := $(SRCDIR)/$(OPEN62541).$(OPEN62541_SUFFIX) > > +OPEN62541_DIR := $(BUILDDIR)/$(OPEN62541) > > +OPEN62541_LICENSE := MPL-2.0 > > +OPEN62541_LICENSE_FILES:= > > file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad > > + > > +OPEN62541_MDNSD_VERSION:= > > 4bd993e0fdd06d54c8fd0b8f416cda6a8db18585 > > +OPEN62541_MDNSD_MD5:= 0961fc8dc253753ec8ea157104671498 > > +OPEN62541_MDNSD_URL:= > > https://github.com/Pro/mdnsd/archive/$(OPEN62541_MDNSD_VERSION)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz > > +OPEN62541_MDNSD_SOURCE := > > $(SRCDIR)/open62541-mdnsd-$(OPEN62541_MDNSD_VERSION).tar.gz > > The suffix deserves a separate variable. I'm curious why, is it used by anything other than the URL? - Roland -- Roland Hieber, Pengutronix e.K. | r.hie...@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 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 v5 1/3] nodejs: version bump 6.9.5 -> 12.14.1 LTS
On Tue, Feb 04, 2020 at 08:53:57AM +0100, Ulrich Ölmann wrote: > From: Björn Esser > > We also need to build a host-nodejs package first, as there > are some tools needed to be executable on the host system > during the intermediate cross-build process. > > This package drops support for NPM, as we will be managing > Node.js packages with Yarn, which will be implemented in the > following commits. > > The patches that are shipped along with this version of the > package have been taken from the SRPM of the Node.js-package > in Fedora. See: > > https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master > > Signed-off-by: Björn Esser > [uol: adjusted commit message, dropped CREDIT lines, removed shell usage & > inserted line break in build command] > Signed-off-by: Ulrich Ölmann /usr/bin/node has an rpath that does not exist: /usr/bin/lib.target Michael > --- > v1 --> v2: fix configure flags for host-nodejs > v2 --> v3: add missing patches, remove obsolete patches > Range-diff of v5 against v4: > 1: e08d21cc0be1 ! 1: 440fed72eaf9 nodejs: version bump 6.9.5 -> 12.14.1 LTS > @@ Commit message > > https://src.fedoraproject.org/rpms/nodejs/c/f0e2a1ed4615?branch=master > > Signed-off-by: Björn Esser > +[uol: adjusted commit message, dropped CREDIT lines, removed shell > usage & > +inserted line break in build command] > +Signed-off-by: Ulrich Ölmann > > ## patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch > (new) ## > @@ > @@ rules/host-nodejs.make > # > # Copyright (C) 2015 by Michael Grzeschik > +# Copyright (C) 2019 by Björn Esser > -+# > -+# 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. > @@ rules/nodejs.make > # > # Copyright (C) 2015 by Michael Grzeschik > +# Copyright (C) 2019 by Björn Esser > -+# > -+# 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. > @@ rules/nodejs.make: NODEJS_ARM_FLOAT_ABI = $(shell ptxd_cross_cc_v | > sed -n "s/CO > +# # to the pre-built host tool binaries, which are different for > +# # each individual checkout of a BSP. -_- > +$(foreach f,$(NODEJS_HOST_TOOLS), \ > -+$(shell sed -i -e > "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/bin/$(f)#" > $(NODEJS_DIR)/node.gyp $(NODEJS_DIR)/tools/v8_gypfiles/v8.gyp) \ > -+) > ++sed -i -e > "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)$(f)<(EXECUTABLE_SUFFIX)#$(PTXDIST_SYSROOT_HOST)/bin/$(f)#" > \ > ++$(NODEJS_DIR)/node.gyp > $(NODEJS_DIR)/tools/v8_gypfiles/v8.gyp $(ptx/nl)) > + > +@$(call world/prepare, NODEJS) > + > > ...1-Disable-running-gyp-on-shared-deps.patch | 25 > ...Install-both-binaries-and-use-libdir.patch | 83 > patches/node-v12.14.1/series | 5 + > ...build-from-source-option-to-npmunbox.patch | 31 - > patches/npmbox-2.6.1/series | 4 - > rules/host-nodejs.in | 2 + > rules/host-nodejs.make| 39 +++--- > rules/nodejs.in | 54 ++-- > rules/nodejs.make | 119 ++ > 9 files changed, 185 insertions(+), 177 deletions(-) > create mode 100644 > patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch > create mode 100644 > patches/node-v12.14.1/0002-Install-both-binaries-and-use-libdir.patch > create mode 100644 patches/node-v12.14.1/series > delete mode 100644 > patches/npmbox-2.6.1/0001-npmbox-add-build-from-source-option-to-npmunbox.patch > delete mode 100644 patches/npmbox-2.6.1/series > > diff --git > a/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch > b/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch > new file mode 100644 > index ..58d46a8f4167 > --- /dev/null > +++ b/patches/node-v12.14.1/0001-Disable-running-gyp-on-shared-deps.patch > @@ -0,0 +1,25 @@ > +From: Zuzana Svetlikova > +Date: Thu, 27 Apr 2017 14:25:42 +0200 > +Subject: [PATCH] Disable running gyp on shared deps > + > +--- > + Makefile | 6 +++--- > + 1 file changed, 3 insertions(+), 3 deletions(-) > + > +diff --git a/Makefile b/Makefile > +index 56f53582d1f4..2fb80e742637 100644 > +--- a/Makefile > b/Makefile > +@@ -141,9 +141,9 @@ test-code-cache: with-code-cache > + echo "'test-code-cache' target is a noop" > + > + out/Makefile: config.gypi common.gypi node.gyp \ > +-deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \ > +-
Re: [ptxdist] [PATCH v5 1/3] mbedtls: new package
On Wed, Feb 05, 2020 at 11:42:39AM +0100, Ulrich Ölmann wrote: > From: Björn Esser > > mbed TLS (formerly known as PolarSSL) makes it trivially easy > for developers to include cryptographic and SSL/TLS capabilities > in their (embedded) products, facilitating this functionality > with a minimal coding footprint. > > Unfortunately the upcoming open62541 package cannot be built > against OpenSSL. To enable its SSL functionality mbed TLS is > needed. > > Signed-off-by: Björn Esser > [uol: adjusted commit message] > Signed-off-by: Ulrich Ölmann > --- > v2 --> v3: adjusted commit message Not your fault, but needs to be fixed: libssh2 now uses /usr/lib/libmbedcrypto.so.3 without depending on it :-/ Michael > > rules/mbedtls.in | 13 + > rules/mbedtls.make | 66 ++ > 2 files changed, 79 insertions(+) > create mode 100644 rules/mbedtls.in > create mode 100644 rules/mbedtls.make > > diff --git a/rules/mbedtls.in b/rules/mbedtls.in > new file mode 100644 > index ..a0d58dbd5468 > --- /dev/null > +++ b/rules/mbedtls.in > @@ -0,0 +1,13 @@ > +## SECTION=system_libraries > + > +config MBEDTLS > + tristate > + prompt "mbedtls" > + select HOST_CMAKE > + select LIBC_PTHREAD > + select ZLIB > + help > + mbed TLS (formerly known as PolarSSL) makes it trivially easy > + for developers to include cryptographic and SSL/TLS capabilities > + in their (embedded) products, facilitating this functionality > + with a minimal coding footprint. > diff --git a/rules/mbedtls.make b/rules/mbedtls.make > new file mode 100644 > index ..0086492fc029 > --- /dev/null > +++ b/rules/mbedtls.make > @@ -0,0 +1,66 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2019 by Bjoern Esser > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_MBEDTLS) += mbedtls > + > +# > +# Paths and names > +# > +MBEDTLS_VERSION := 2.16.3 > +MBEDTLS_MD5 := 90ce7c7a001d2514410280706b3ab1a7 > +MBEDTLS := mbedtls-$(MBEDTLS_VERSION) > +MBEDTLS_SUFFIX := tgz > +MBEDTLS_URL := > https://tls.mbed.org/download/$(MBEDTLS)-apache.$(MBEDTLS_SUFFIX) > +MBEDTLS_SOURCE := $(SRCDIR)/$(MBEDTLS).$(MBEDTLS_SUFFIX) > +MBEDTLS_DIR := $(BUILDDIR)/$(MBEDTLS) > +MBEDTLS_LICENSE := Apache-2.0 > +MBEDTLS_LICENSE_FILES:= > file://apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 > + > +# > > +# Prepare > +# > > + > +# > +# cmake > +# > +MBEDTLS_CONF_TOOL:= cmake > +MBEDTLS_CONF_OPT := \ > + $(CROSS_CMAKE_USR) \ > + -DENABLE_PROGRAMS=OFF \ > + -DENABLE_TESTING=OFF \ > + -DENABLE_ZLIB_SUPPORT=ON \ > + -DINSTALL_MBEDTLS_HEADERS=ON \ > + -DLINK_WITH_PTHREAD=ON \ > + -DUNSAFE_BUILD=OFF \ > + -DUSE_PKCS11_HELPER_LIBRARY=OFF \ > + -DUSE_SHARED_MBEDTLS_LIBRARY=ON \ > + -DUSE_STATIC_MBEDTLS_LIBRARY=OFF > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/mbedtls.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, mbedtls) > + @$(call install_fixup, mbedtls,PRIORITY,optional) > + @$(call install_fixup, mbedtls,SECTION,base) > + @$(call install_fixup, mbedtls,AUTHOR,"Bjoern Esser > ") > + @$(call install_fixup, mbedtls,DESCRIPTION,missing) > + > + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedcrypto) > + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedtls) > + @$(call install_lib, mbedtls, 0, 0, 0644, libmbedx509) > + > + @$(call install_finish, mbedtls) > + > + @$(call touch) > -- > 2.25.0 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 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] syslogng: update to 3.25.1
On Thu, Feb 13, 2020 at 06:22:08PM +0100, Matthias Schiffer wrote:
> Update and move out of staging. The new version adds compatiblity with
> OpenSSL 1.1.x and switches to Python 3.
>
> The AMQP and MongoDB destinations are removed, they were never buildable
> without additional packages not available in plain PTXdist.
>
> A simple replacement for the old systemd unit is added, as the new version
> only provides an instanced unit which cannot be linked as syslog.service
> (which is necessary to use syslog-ng as the default system logger by
> enabling ForwardToSyslog in journald.conf).
>
> Signed-off-by: Matthias Schiffer
> ---
> projectroot/etc/syslog-ng.conf| 6 +++--
> .../usr/lib/systemd/system/syslog-ng.service | 20 +
> rules/syslogng.in | 22 ++-
> rules/syslogng.make | 18 +--
> 4 files changed, 37 insertions(+), 29 deletions(-)
> create mode 100644 projectroot/usr/lib/systemd/system/syslog-ng.service
>
> diff --git a/projectroot/etc/syslog-ng.conf b/projectroot/etc/syslog-ng.conf
> index 254aecfd2..0235b9857 100644
> --- a/projectroot/etc/syslog-ng.conf
> +++ b/projectroot/etc/syslog-ng.conf
> @@ -1,13 +1,15 @@
> #
> -# syslog-ng configuration
> +# syslog-ng configuration
> #
>
> +@version: 3.25
> +
> #
> # Options
> #
>
> # sync every 0 lines
> -options { long_hostnames(off); sync(0); };
> +options { chain_hostnames(off); flush_lines(0); };
>
> #
> # Sources
> diff --git a/projectroot/usr/lib/systemd/system/syslog-ng.service
> b/projectroot/usr/lib/systemd/system/syslog-ng.service
> new file mode 100644
> index 0..6bf591efd
> --- /dev/null
> +++ b/projectroot/usr/lib/systemd/system/syslog-ng.service
> @@ -0,0 +1,20 @@
> +[Unit]
> +Description=System Logger Daemon
> +Documentation=man:syslog-ng(8)
> +Conflicts=emergency.service emergency.target
> +Requires=syslog.socket
> +Wants=network.target network-online.target
> +After=network.target network-online.target
> +
> +[Service]
> +Type=notify
> +ExecStartPre=/bin/mkdir -p /var/lib/syslog-ng
> +ExecStart=/usr/sbin/syslog-ng -F --enable-core --cfgfile /etc/syslog-ng.conf
> --control /var/run/syslog-ng.ctl --persist-file
> /var/lib/syslog-ng/syslog-ng.persist --pidfile /var/run/syslog-ng.pid
> +ExecReload=/bin/kill -HUP $MAINPID
> +StandardOutput=journal
> +StandardError=journal
> +Restart=on-failure
> +
> +[Install]
> +Alias=syslog.service
> +WantedBy=multi-user.target
> diff --git a/rules/syslogng.in b/rules/syslogng.in
> index 3b1af844b..29d26e72a 100644
> --- a/rules/syslogng.in
> +++ b/rules/syslogng.in
> @@ -1,6 +1,4 @@
> -## SECTION=staging
> -## old section:
> -### SECTION=networking
> +## SECTION=networking
> # syslog-ng configuration
>
> menuconfig SYSLOGNG
> @@ -9,7 +7,7 @@ menuconfig SYSLOGNG
> select EVENTLOG
> select GLIB
> select OPENSSL
> - select PYTHON if SYSLOGNG_PYTHON_DESTINATION
> + select PYTHON3 if SYSLOGNG_PYTHON_DESTINATION
> select LIBC_NSL
> select LIBC_RT
> select LIBNET if SYSLOGNG_SPOOF_SOURCE
> @@ -19,10 +17,6 @@ menuconfig SYSLOGNG
> help
> The next generation syslog daemon.
>
> - STAGING: remove in ptxdist-2020.01.0
> - Fails to build with OpenSSL 1.1.x. Update to a new version is
> - needed.
> -
> if SYSLOGNG
>
> config SYSLOGNG_TCP_WRAPPER
> @@ -46,18 +40,6 @@ config SYSLOGNG_SPOOF_SOURCE
> destinations though the original message can be
> received by TCP as well.
>
> -config SYSLOGNG_AMQP_DESTINATION
> - bool
> - prompt "support the AMQP destination"
> - help
> - Enables the ability to publish AMQP messages.
> -
> -config SYSLOGNG_MONGODB_DESTINATION
> - bool
> - prompt "support the MongoDB destination"
> - help
> - Enables the ability to send messages to a MongoDB database.
> -
> config SYSLOGNG_PYTHON_DESTINATION
> bool
> prompt "support the python destination"
> diff --git a/rules/syslogng.make b/rules/syslogng.make
> index 114f72cef..4025fc0fa 100644
> --- a/rules/syslogng.make
> +++ b/rules/syslogng.make
> @@ -16,9 +16,9 @@ PACKAGES-$(PTXCONF_SYSLOGNG) += syslogng
> #
> # Paths and names
> #
> -SYSLOGNG_VERSION := 3.7.3
> -SYSLOG_LIBVERSION:= 3.7
> -SYSLOGNG_MD5 := 803d61a713d6d41a973942d417fec999
> +SYSLOGNG_VERSION := 3.25.1
> +SYSLOG_LIBVERSION:= 3.25
> +SYSLOGNG_MD5 := 07c2ebb712ddacd201b24b265b857b0d
> SYSLOGNG := syslog-ng-$(SYSLOGNG_VERSION)
> SYSLOGNG_SUFFIX := tar.gz
> SYSLOGNG_URL :=
> https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOGNG_VERSION)/$(SYSLOGNG).$(SYSLOGNG_SUFFIX)
> @@ -32,7 +32,7 @@ SYSLOGNG_LICENSE:= GPL-2.0-or-later AND LGPL-2.1-only
>
> SYSLOGNG_ENV = \
> $(CROSS_ENV) \
> - ac_cv_path_PYTHON=$(CROSS_PYTHON)
> +
[ptxdist] [PATCH v2] kmscube: switch to https archive download
Signed-off-by: Matthias Schiffer --- rules/kmscube.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/kmscube.make b/rules/kmscube.make index a6d5d0150..5275a627c 100644 --- a/rules/kmscube.make +++ b/rules/kmscube.make @@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_KMSCUBE) += kmscube KMSCUBE_VERSION:= 2017-03-13-g803bac5 KMSCUBE:= kmscube-$(KMSCUBE_VERSION) KMSCUBE_MD5:= 781a59ab2d1d245e99a49df7c3dc1876 -KMSCUBE_URL:= git://anongit.freedesktop.org/mesa/kmscube;tag=$(KMSCUBE_VERSION) KMSCUBE_SUFFIX := tar.gz +KMSCUBE_URL:= https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$(KMSCUBE_VERSION)/$(KMSCUBE).$(KMSCUBE_SUFFIX) KMSCUBE_SOURCE := $(SRCDIR)/$(KMSCUBE).$(KMSCUBE_SUFFIX) KMSCUBE_DIR:= $(BUILDDIR)/$(KMSCUBE) -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v4] parted: update to 3.3
Fixes build against recent glibc. Signed-off-by: Markus Niebel Signed-off-by: Matthias Schiffer --- ...gets-is-defined-before-undefining-it.patch | 26 --- patches/parted-2.3/series | 4 --- rules/parted.in | 12 - rules/parted.make | 10 +++ 4 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch delete mode 100644 patches/parted-2.3/series diff --git a/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch b/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch deleted file mode 100644 index b2be0f21c..0 --- a/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Michael Olbrich -Date: Fri, 7 Dec 2012 11:47:58 +0100 -Subject: [PATCH] make sure 'gets' is defined before undefining it - -glibc 2.16 has removed gets completely - -Signed-off-by: Michael Olbrich - lib/stdio.in.h |2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index 79dda5f..e3ede74 100644 a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -142,8 +142,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - " - /* It is very rare that the developer ever has full control of stdin, -so any use of gets warrants an unconditional warning. Assume it is -always declared, since it is required by C89. */ -+#if defined gets - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ diff --git a/patches/parted-2.3/series b/patches/parted-2.3/series deleted file mode 100644 index 3aed33f27..0 --- a/patches/parted-2.3/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-make-sure-gets-is-defined-before-undefining-it.patch -# 193fb47748b8a510e34ff1672ac111fc - git-ptx-patches magic diff --git a/rules/parted.in b/rules/parted.in index 2e9f54a31..dbaef4b0a 100644 --- a/rules/parted.in +++ b/rules/parted.in @@ -1,18 +1,18 @@ -## SECTION=staging -## old section: -### SECTION=shell_and_console +## SECTION=shell_and_console config PARTED tristate prompt "parted" - select GETTEXT + select HOST_GETTEXT select READLINE + select LIBUUID select E2FSPROGS select NCURSES + depends on !BUSYBOX_PARTPROBE || ALLYES help The GNU Parted program allows you to create, destroy, resize, move, and copy hard disk partitions. Parted can be used for creating space for new operating systems, reorganizing disk usage, and copying data to new hard disks. - STAGING: remove in ptxdist-2020.06.0 - Old version that need to be updated. Fails to build with glibc-2.28. +comment "busybox' partprobe is selected!" + depends on BUSYBOX_PARTPROBE diff --git a/rules/parted.make b/rules/parted.make index 6b994f372..eca3f9eee 100644 --- a/rules/parted.make +++ b/rules/parted.make @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted # # Paths and names # -PARTED_VERSION := 2.3 -PARTED_MD5 := 30ceb6df7e8681891e865e2fe5a7903d +PARTED_VERSION := 3.3 +PARTED_MD5 := 090655d05f3c471aa8e15a27536889ec PARTED := parted-$(PARTED_VERSION) -PARTED_SUFFIX := tar.gz +PARTED_SUFFIX := tar.xz PARTED_URL := $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX)) PARTED_SOURCE := $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX) PARTED_DIR := $(BUILDDIR)/$(PARTED) @@ -29,8 +29,8 @@ PARTED_LICENSE:= GPL-3.0-only PARTED_CONF_TOOL := autoconf PARTED_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --disable-device-mapper \ - --disable-Werror + --without-readline \ + --disable-device-mapper # # Target-Install -- 2.17.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH v2] u-boot: Add support for custom make options
For some platforms (e.g. stm32mp1) the official way to build U-boot with a device tree other than the board's default requires passing additional make options such as DEVICE_TREE=xxx or EXT_DTB=xxx. Instead of adding each possible option as a parameter in the .in file, add a generic mechanism to allow passing custom make options to U-boot. A similar approach has been adopted by buildroot. Signed-off-by: Guillermo Rodriguez --- v2: Rewrite commit message including rationale platforms/u-boot.in | 7 +++ rules/u-boot.make | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/platforms/u-boot.in b/platforms/u-boot.in index 50fb008a3..491faed60 100644 --- a/platforms/u-boot.in +++ b/platforms/u-boot.in @@ -71,6 +71,13 @@ config U_BOOT_CONFIG endif +config U_BOOT_CUSTOM_MAKE_OPTS + prompt "Custom make options" + string + help + List of custom make options passed at build time. Can be + used for example to pass a DEVICE_TREE= value. + choice prompt "Generate environment image" default U_BOOT_ENV_IMAGE_NONE diff --git a/rules/u-boot.make b/rules/u-boot.make index 0c6bccc71..e386dc4d2 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -55,7 +55,8 @@ U_BOOT_WRAPPER_BLACKLIST := \ U_BOOT_CONF_OPT:= \ -C $(U_BOOT_DIR) \ O=$(U_BOOT_BUILD_DIR) \ - V=$(PTXDIST_VERBOSE) + V=$(PTXDIST_VERBOSE) \ + $(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_OPTS)) U_BOOT_MAKE_ENV:= \ CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ -- 2.21.0 ___ ptxdist mailing list ptxdist@pengutronix.de
