Re: [ptxdist] [PATCH] host-systemd: Add option to install dev files
On Wed, Jul 07, 2021 at 05:06:56PM -0400, Jon Ringle wrote:
> On Fri, Jun 25, 2021 at 5:41 AM Michael Olbrich
> wrote:
>
> > On Tue, Jun 22, 2021 at 04:35:04PM +, j...@ringle.org wrote:
> > > From: Jon Ringle
> > >
> > > Doing a full install that include dev files is
> > > helpful if a project needs this support.
> > >
> > > I created a host-sdbus-cpp project that depends
> > > on libsystemd. The -Drootprefix=/ was required
> > > to have cmake pkg-config work properly.
> > >
> > > Signed-off-by: Jon Ringle
> > > ---
> > > rules/host-systemd.in | 7 +++
> > > rules/host-systemd.make | 7 +++
> > > 2 files changed, 14 insertions(+)
> > >
> > > diff --git a/rules/host-systemd.in b/rules/host-systemd.in
> > > index f80d9de10..828694f80 100644
> > > --- a/rules/host-systemd.in
> > > +++ b/rules/host-systemd.in
> > > @@ -7,3 +7,10 @@ config HOST_SYSTEMD
> > > select HOST_GPERF
> > > select HOST_UTIL_LINUX_NG
> > > select HOST_LIBCAP
> > > +
> > > +config HOST_SYSTEMD_INSTALL_DEV
> > > + bool
> > > + default n
> > > + help
> > > + Install host systemd development headers/libs
> > > +
> > > diff --git a/rules/host-systemd.make b/rules/host-systemd.make
> > > index 42409d7b5..58b44a683 100644
> > > --- a/rules/host-systemd.make
> > > +++ b/rules/host-systemd.make
> > > @@ -20,6 +20,7 @@ HOST_SYSTEMD_CONF_TOOL := meson
> > > HOST_SYSTEMD_CONF_OPT:= \
> > > $(HOST_MESON_OPT) \
> > > -Dprefix=/usr \
> > > + -Drootprefix=/ \
> >
> > This breaks hwdb: The path for the output file is hardcoded as
> > "${destdir}${rootprefix}/lib/udev/hwdb.bin"
> >
> > This breaks hwdb for the host package?
>
>
> > Hmmm, maybe we could add '/usr' to the destdir. Please try that. This is
> > the '--root' argument the systemd-hwdb package.
> > If it works then the systemd-hwdb package should generate a hwdb that is
> > about 10MB in size.
> >
> > If it works, remove the prefix instead of adding the rootprefix.
> >
> >
> I'm trying to work out how the systemd-hwdb package relates to the
> host-systemd package...
host-systemd provides the systemd-hwdb host tool that the systemd-hwdb
package uses to generate the hwdb database at build-time.
The (relative) path, where the database is created is hardcoded and defined
by the rootprefix.
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
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] host-systemd: Add option to install dev files
Hi Michael
On Fri, Jun 25, 2021 at 5:41 AM Michael Olbrich
wrote:
> On Tue, Jun 22, 2021 at 04:35:04PM +, j...@ringle.org wrote:
> > From: Jon Ringle
> >
> > Doing a full install that include dev files is
> > helpful if a project needs this support.
> >
> > I created a host-sdbus-cpp project that depends
> > on libsystemd. The -Drootprefix=/ was required
> > to have cmake pkg-config work properly.
> >
> > Signed-off-by: Jon Ringle
> > ---
> > rules/host-systemd.in | 7 +++
> > rules/host-systemd.make | 7 +++
> > 2 files changed, 14 insertions(+)
> >
> > diff --git a/rules/host-systemd.in b/rules/host-systemd.in
> > index f80d9de10..828694f80 100644
> > --- a/rules/host-systemd.in
> > +++ b/rules/host-systemd.in
> > @@ -7,3 +7,10 @@ config HOST_SYSTEMD
> > select HOST_GPERF
> > select HOST_UTIL_LINUX_NG
> > select HOST_LIBCAP
> > +
> > +config HOST_SYSTEMD_INSTALL_DEV
> > + bool
> > + default n
> > + help
> > + Install host systemd development headers/libs
> > +
> > diff --git a/rules/host-systemd.make b/rules/host-systemd.make
> > index 42409d7b5..58b44a683 100644
> > --- a/rules/host-systemd.make
> > +++ b/rules/host-systemd.make
> > @@ -20,6 +20,7 @@ HOST_SYSTEMD_CONF_TOOL := meson
> > HOST_SYSTEMD_CONF_OPT:= \
> > $(HOST_MESON_OPT) \
> > -Dprefix=/usr \
> > + -Drootprefix=/ \
>
> This breaks hwdb: The path for the output file is hardcoded as
> "${destdir}${rootprefix}/lib/udev/hwdb.bin"
>
> This breaks hwdb for the host package?
> Hmmm, maybe we could add '/usr' to the destdir. Please try that. This is
> the '--root' argument the systemd-hwdb package.
> If it works then the systemd-hwdb package should generate a hwdb that is
> about 10MB in size.
>
> If it works, remove the prefix instead of adding the rootprefix.
>
>
I'm trying to work out how the systemd-hwdb package relates to the
host-systemd package...
-Jon
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1
On Wed, Jul 07, 2021 at 04:52:23PM +0200, Bruno Thomsen wrote: > Den ons. 7. jul. 2021 kl. 16.31 skrev Michael Olbrich > : > > > > On Mon, Jul 05, 2021 at 09:49:25AM +0200, Uwe Kleine-König wrote: > > > --- > > > ...ke-unrecognized-option-a-fatal-error.patch | 25 - > > > patches/chrony-3.5/series | 4 --- > > > ...t-install-docs-to-not-need-additiona.patch | 21 +++ > > > ...vice-Make-this-a-non-forking-service.patch | 27 +++ > > > patches/chrony-4.1/series | 5 > > > rules/chrony.make | 4 +-- > > > 6 files changed, 55 insertions(+), 31 deletions(-) > > > delete mode 100644 > > > patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > > delete mode 100644 patches/chrony-3.5/series > > > create mode 100644 > > > patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > > > create mode 100644 > > > patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > > > create mode 100644 patches/chrony-4.1/series > > > > > > diff --git > > > a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > > > > > b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > > deleted file mode 100644 > > > index 01f2136338b9.. > > > --- > > > a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > > +++ /dev/null > > > @@ -1,25 +0,0 @@ > > > -From: Bruno Thomsen > > > -Date: Fri, 31 Jul 2020 09:07:49 + > > > -Subject: [PATCH] configure: make unrecognized option a fatal error > > > - > > > -This helps catch cases where options has been removed > > > -and are no longer valid. Including additional cross-build > > > -options that cannot be used. > > > - > > > -Signed-off-by: Bruno Thomsen > > Hi, > > This patch was added last year to ptxdist, so it's possible to detect > unrecognized options in new chrony versions as they use a custom > hand crafted configure script. So unless that situation has changed > this patch should be kept. I dropped it because it is only important when you do a version bump. As you usually go through all of the configure flags anyhow I didn't consider it useful enough to keep it. However I don't feel strong here, so if you do, I can keep it. Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König| Industrial Linux Solutions | https://www.pengutronix.de/ | signature.asc Description: PGP signature ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1
Den ons. 7. jul. 2021 kl. 16.31 skrev Michael Olbrich : > > On Mon, Jul 05, 2021 at 09:49:25AM +0200, Uwe Kleine-König wrote: > > --- > > ...ke-unrecognized-option-a-fatal-error.patch | 25 - > > patches/chrony-3.5/series | 4 --- > > ...t-install-docs-to-not-need-additiona.patch | 21 +++ > > ...vice-Make-this-a-non-forking-service.patch | 27 +++ > > patches/chrony-4.1/series | 5 > > rules/chrony.make | 4 +-- > > 6 files changed, 55 insertions(+), 31 deletions(-) > > delete mode 100644 > > patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > delete mode 100644 patches/chrony-3.5/series > > create mode 100644 > > patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > > create mode 100644 > > patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > > create mode 100644 patches/chrony-4.1/series > > > > diff --git > > a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > > > b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > deleted file mode 100644 > > index 01f2136338b9.. > > --- > > a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > +++ /dev/null > > @@ -1,25 +0,0 @@ > > -From: Bruno Thomsen > > -Date: Fri, 31 Jul 2020 09:07:49 + > > -Subject: [PATCH] configure: make unrecognized option a fatal error > > - > > -This helps catch cases where options has been removed > > -and are no longer valid. Including additional cross-build > > -options that cannot be used. > > - > > -Signed-off-by: Bruno Thomsen Hi, This patch was added last year to ptxdist, so it's possible to detect unrecognized options in new chrony versions as they use a custom hand crafted configure script. So unless that situation has changed this patch should be kept. /Bruno > > > > - configure | 1 + > > - 1 file changed, 1 insertion(+) > > - > > -diff --git a/configure b/configure > > -index 323f5743cd57..080f7bce746d 100755 > > a/configure > > -+++ b/configure > > -@@ -388,6 +388,7 @@ do > > - ;; > > - * ) > > - echo "Unrecognized option : " $option > > -+exit 1 > > - esac > > - done > > - > > diff --git a/patches/chrony-3.5/series b/patches/chrony-3.5/series > > deleted file mode 100644 > > index 5019725586fd.. > > --- a/patches/chrony-3.5/series > > +++ /dev/null > > @@ -1,4 +0,0 @@ > > -# generated by git-ptx-patches > > -#tag:base --start-number 1 > > -0001-configure-make-unrecognized-option-a-fatal-error.patch > > -# c182e03aeda3f8c148ae51d52f839a6a - git-ptx-patches magic > > diff --git > > a/patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > > > > b/patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > > new file mode 100644 > > index ..13d3df8c7dcb > > --- /dev/null > > +++ > > b/patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > > @@ -0,0 +1,21 @@ > > +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= > > +Date: Mon, 19 Apr 2021 17:33:41 +0200 > > +Subject: [PATCH] Makefile.in: Don't install docs to not need additional > > build > > + dependencies > > I don't think this is needed in general: The *.man.in files are shipped in > the tarball, and then only 'sed' is needed. > Maybe you worked with a git checkout in local_src/ when this happened? > > > + > > +--- > > + Makefile.in | 1 - > > + 1 file changed, 1 deletion(-) > > + > > +diff --git a/Makefile.in b/Makefile.in > > +index 9a51df20074a..758e1e87771d 100644 > > +--- a/Makefile.in > > b/Makefile.in > > +@@ -95,7 +95,6 @@ install: chronyd chronyc > > + chmod 755 $(DESTDIR)$(SBINDIR)/chronyd > > + cp chronyc $(DESTDIR)$(BINDIR)/chronyc > > + chmod 755 $(DESTDIR)$(BINDIR)/chronyc > > +-$(MAKE) -C doc install > > + > > + docs : > > + $(MAKE) -C doc docs > > diff --git > > a/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > > > > b/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > > new file mode 100644 > > index ..39c1e0e79f16 > > --- /dev/null > > +++ > > b/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > > @@ -0,0 +1,27 @@ > > +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= > > +Date: Mon, 19 Apr 2021 17:34:34 +0200 > > +Subject: [PATCH] chronyd.service: Make this a non-forking service > > + > > +This allows to add -d to $OPTIONS without systemd killing the daemon > > +after a short uptime. > > +--- > > + examples/chronyd.service | 4 ++-- > > + 1 file changed, 2 insertions(+), 2 deletions(-) > > + > > +diff --git a/examples/chronyd.service b/examples/chronyd.service > > +index 289548cbab87..7a7c693d9e63 100644 > > +--- a/examples/chronyd.service > >
Re: [ptxdist] [PATCH 2/2] python3-pycryptodomex: fix license identifier
On Wed, Jul 07, 2021 at 03:53:06PM +0200, Roland Hieber wrote: > LICENSE.rst includes an Unlicense and a BSD-2-Clause, and refers to > additional licenses for the OCB code, which contains a restriction for > "military purposes", and is not compatible with the Open Source > Definition. > > Fixes: b8958ad388ba104527e2 (2021-07-02, "python3-pycryptodomex: new package") > Cc: Lars Pedersen > Signed-off-by: Roland Hieber > --- > rules/python3-pycryptodomex.make | 7 +-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/rules/python3-pycryptodomex.make > b/rules/python3-pycryptodomex.make > index 59dadfbd0d29..9409bb414e88 100644 > --- a/rules/python3-pycryptodomex.make > +++ b/rules/python3-pycryptodomex.make > @@ -21,9 +21,12 @@ PYTHON3_PYCRYPTODOMEX_SUFFIX := tar.gz > PYTHON3_PYCRYPTODOMEX_URL:= $(call ptx/mirror-pypi, pycryptodomex, > $(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX)) > PYTHON3_PYCRYPTODOMEX_SOURCE := > $(SRCDIR)/$(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX) > PYTHON3_PYCRYPTODOMEX_DIR:= $(BUILDDIR)/$(PYTHON3_PYCRYPTODOMEX) > -PYTHON3_PYCRYPTODOMEX_LICENSE:= BSD-2 > +PYTHON3_PYCRYPTODOMEX_LICENSE:= Unlicense AND BSD-2-Clause and > proprietary I think this should be 'custom' not 'proprietary'. If 'proprietary' then we assume that the code is closed source. That's not the case here. Michael > PYTHON3_PYCRYPTODOMEX_LICENSE_FILES := \ > - file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c > + file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c \ > + file://Doc/ocb/license1.pdf;md5=e33fa8dcf4d10e5c0d9a9e9291714d3d \ > + file://Doc/ocb/license2.pdf;md5=68cfc4690fbbaa0d89d3ea3abcc60b0f \ > + file://Doc/ocb/license3.pdf;md5=2124679d48d559681738985e040ae388 > > # > > # Prepare > -- > 2.30.2 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@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 To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] chrony: version bump 3.5 -> 4.1
On Mon, Jul 05, 2021 at 09:49:25AM +0200, Uwe Kleine-König wrote: > --- > ...ke-unrecognized-option-a-fatal-error.patch | 25 - > patches/chrony-3.5/series | 4 --- > ...t-install-docs-to-not-need-additiona.patch | 21 +++ > ...vice-Make-this-a-non-forking-service.patch | 27 +++ > patches/chrony-4.1/series | 5 > rules/chrony.make | 4 +-- > 6 files changed, 55 insertions(+), 31 deletions(-) > delete mode 100644 > patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > delete mode 100644 patches/chrony-3.5/series > create mode 100644 > patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > create mode 100644 > patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > create mode 100644 patches/chrony-4.1/series > > diff --git > a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > > b/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > deleted file mode 100644 > index 01f2136338b9.. > --- > a/patches/chrony-3.5/0001-configure-make-unrecognized-option-a-fatal-error.patch > +++ /dev/null > @@ -1,25 +0,0 @@ > -From: Bruno Thomsen > -Date: Fri, 31 Jul 2020 09:07:49 + > -Subject: [PATCH] configure: make unrecognized option a fatal error > - > -This helps catch cases where options has been removed > -and are no longer valid. Including additional cross-build > -options that cannot be used. > - > -Signed-off-by: Bruno Thomsen > > - configure | 1 + > - 1 file changed, 1 insertion(+) > - > -diff --git a/configure b/configure > -index 323f5743cd57..080f7bce746d 100755 > a/configure > -+++ b/configure > -@@ -388,6 +388,7 @@ do > - ;; > - * ) > - echo "Unrecognized option : " $option > -+exit 1 > - esac > - done > - > diff --git a/patches/chrony-3.5/series b/patches/chrony-3.5/series > deleted file mode 100644 > index 5019725586fd.. > --- a/patches/chrony-3.5/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-configure-make-unrecognized-option-a-fatal-error.patch > -# c182e03aeda3f8c148ae51d52f839a6a - git-ptx-patches magic > diff --git > a/patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > > b/patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > new file mode 100644 > index ..13d3df8c7dcb > --- /dev/null > +++ > b/patches/chrony-4.1/0001-Makefile.in-Don-t-install-docs-to-not-need-additiona.patch > @@ -0,0 +1,21 @@ > +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= > +Date: Mon, 19 Apr 2021 17:33:41 +0200 > +Subject: [PATCH] Makefile.in: Don't install docs to not need additional build > + dependencies I don't think this is needed in general: The *.man.in files are shipped in the tarball, and then only 'sed' is needed. Maybe you worked with a git checkout in local_src/ when this happened? > + > +--- > + Makefile.in | 1 - > + 1 file changed, 1 deletion(-) > + > +diff --git a/Makefile.in b/Makefile.in > +index 9a51df20074a..758e1e87771d 100644 > +--- a/Makefile.in > b/Makefile.in > +@@ -95,7 +95,6 @@ install: chronyd chronyc > + chmod 755 $(DESTDIR)$(SBINDIR)/chronyd > + cp chronyc $(DESTDIR)$(BINDIR)/chronyc > + chmod 755 $(DESTDIR)$(BINDIR)/chronyc > +-$(MAKE) -C doc install > + > + docs : > + $(MAKE) -C doc docs > diff --git > a/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > > b/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > new file mode 100644 > index ..39c1e0e79f16 > --- /dev/null > +++ > b/patches/chrony-4.1/0002-chronyd.service-Make-this-a-non-forking-service.patch > @@ -0,0 +1,27 @@ > +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= > +Date: Mon, 19 Apr 2021 17:34:34 +0200 > +Subject: [PATCH] chronyd.service: Make this a non-forking service > + > +This allows to add -d to $OPTIONS without systemd killing the daemon > +after a short uptime. > +--- > + examples/chronyd.service | 4 ++-- > + 1 file changed, 2 insertions(+), 2 deletions(-) > + > +diff --git a/examples/chronyd.service b/examples/chronyd.service > +index 289548cbab87..7a7c693d9e63 100644 > +--- a/examples/chronyd.service > b/examples/chronyd.service > +@@ -6,10 +6,10 @@ Conflicts=ntpd.service systemd-timesyncd.service > + ConditionCapability=CAP_SYS_TIME > + > + [Service] > +-Type=forking > ++Type=exec > + PIDFile=/run/chrony/chronyd.pid > + EnvironmentFile=-/etc/sysconfig/chronyd > +-ExecStart=/usr/sbin/chronyd $OPTIONS > ++ExecStart=/usr/sbin/chronyd -d $OPTIONS Maybe use -n instead of -d to keep the logging as it was? Michael > + PrivateTmp=yes > + ProtectHome=yes > + ProtectSystem=full > diff --git a/patches/chrony-4.1/series b/patches/chrony-4.1/series > new file mode
Re: [ptxdist] [PATCH 1/2] chrony: unify location of config files
On Mon, Jul 05, 2021 at 09:49:24AM +0200, Uwe Kleine-König wrote:
> The upstream default location of the config file is directly in /etc
> instead of /etc/chrony/ and also the systemd unit uses /etc. So switch
> the init script and ptxdist rules accordingly.
We have
projectroot/etc/chrony/chrony.conf
projectroot/etc/chrony/chrony.keys
in PTXdist. Those should be moved, right?
Michael
> Signed-off-by: Uwe Kleine-König
> ---
> projectroot/etc/init.d/chrony | 4 ++--
> rules/chrony.make | 8
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/projectroot/etc/init.d/chrony b/projectroot/etc/init.d/chrony
> index d112927f825e..1602eec6dcb9 100644
> --- a/projectroot/etc/init.d/chrony
> +++ b/projectroot/etc/init.d/chrony
> @@ -9,14 +9,14 @@
>
> PATH=/sbin:/bin:/usr/bin:/usr/sbin
> BINARY="/usr/sbin/chronyd"
> -CONFIG="/etc/chrony/chrony.conf"
> +CONFIG="/etc/chrony.conf"
> PREFIX="chrony: "
> # This system doesn?t have full rtc ioctl support for
> # chrony statistic functions
> RTC_IOCTL="incomplete"
>
> # some chronyc commands need prior autentication: extract keys from config
> -KEY=$(awk '$1 ~ /^commandkey$/ { print $2; exit}' /etc/chrony/chrony.conf)
> +KEY=$(awk '$1 ~ /^commandkey$/ { print $2; exit}' "$CONFIG")
> PASSWORD=`awk '$1 ~ /^'$KEY'$/ {print $2; exit}' /etc/chrony/chrony.keys`
>
> # convenience functions
> diff --git a/rules/chrony.make b/rules/chrony.make
> index cbdf9314b52b..bdceb454c175 100644
> --- a/rules/chrony.make
> +++ b/rules/chrony.make
> @@ -100,14 +100,14 @@ endif
>
> # generic one
> ifdef PTXCONF_CHRONY_INSTALL_CONFIG
> - @$(call install_alternative, chrony, 0, 0, 0644,
> /etc/chrony/chrony.conf)
> - @$(call install_alternative, chrony, 0, 0, 0600,
> /etc/chrony/chrony.keys)
> + @$(call install_alternative, chrony, 0, 0, 0644, /etc/chrony.conf)
> + @$(call install_alternative, chrony, 0, 0, 0600, /etc/chrony.keys)
>
> # modify placeholders with data from configuration
> - @$(call install_replace, chrony, /etc/chrony/chrony.conf, \
> + @$(call install_replace, chrony, /etc/chrony.conf, \
> @UNCONFIGURED_CHRONY_SERVER_IP@,
> $(PTXCONF_CHRONY_DEFAULT_NTP_SERVER))
>
> - @$(call install_replace, chrony, /etc/chrony/chrony.keys, \
> + @$(call install_replace, chrony, /etc/chrony.keys, \
> @UNCONFIGURED_CHRONY_ACCESS_KEY@,
> $(PTXCONF_CHRONY_DEFAULT_ACCESS_KEY))
> endif
>
> --
> 2.30.2
>
>
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to
> ptxdist-requ...@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
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 4/4] python3-snmpclitools: new package
On Mon, Jul 05, 2021 at 11:33:50AM +0200, Lars Pedersen wrote: > This is a collection of command-line SNMP tools written in pure-Python. > This package depends on python3-pysnmp > > Signed-off-by: Lars Pedersen > --- > rules/python3-snmpclitools.in | 9 ++ > rules/python3-snmpclitools.make | 56 + > 2 files changed, 65 insertions(+) > create mode 100644 rules/python3-snmpclitools.in > create mode 100644 rules/python3-snmpclitools.make > > diff --git a/rules/python3-snmpclitools.in b/rules/python3-snmpclitools.in > new file mode 100644 > index 0..369b2bd65 > --- /dev/null > +++ b/rules/python3-snmpclitools.in > @@ -0,0 +1,9 @@ > +## SECTION=python3 > + > +config PYTHON3_SNMPCLITOOLS > + tristate > + select PYTHON3 > + select PYTHON3_PYSNMP > + prompt "snmpclitools" > + help > + This is a collection of command-line SNMP tools written in pure-Python > diff --git a/rules/python3-snmpclitools.make b/rules/python3-snmpclitools.make > new file mode 100644 > index 0..050373add > --- /dev/null > +++ b/rules/python3-snmpclitools.make > @@ -0,0 +1,56 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2021 by Lars Pedersen > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PYTHON3_SNMPCLITOOLS) += python3-snmpclitools > + > +# > +# Paths and names > +# > +PYTHON3_SNMPCLITOOLS_VERSION := 0.6.4 > +PYTHON3_SNMPCLITOOLS_MD5 := 132b100f5e7b80715e6c1d424e89687c > +PYTHON3_SNMPCLITOOLS := snmpclitools-$(PYTHON3_SNMPCLITOOLS_VERSION) > +PYTHON3_SNMPCLITOOLS_SUFFIX := tar.gz > +PYTHON3_SNMPCLITOOLS_URL := $(call ptx/mirror-pypi, snmpclitools, > $(PYTHON3_SNMPCLITOOLS).$(PYTHON3_SNMPCLITOOLS_SUFFIX)) > +PYTHON3_SNMPCLITOOLS_SOURCE := > $(SRCDIR)/$(PYTHON3_SNMPCLITOOLS).$(PYTHON3_SNMPCLITOOLS_SUFFIX) > +PYTHON3_SNMPCLITOOLS_DIR := $(BUILDDIR)/$(PYTHON3_SNMPCLITOOLS) > +PYTHON3_SNMPCLITOOLS_LICENSE := BSD-2pick No LICENSE.rst in this one…? Or any license statements in source files? - Roland > + > +# > > +# Prepare > +# > > + > +PYTHON3_SNMPCLITOOLS_CONF_TOOL := python3 > +PYTHON3_SNMPCLITOOLS_MAKE_OPT:= install_scripts > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/python3-snmpclitools.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, python3-snmpclitools) > + @$(call install_fixup, python3-snmpclitools,PRIORITY,optional) > + @$(call install_fixup, python3-snmpclitools,SECTION,base) > + @$(call install_fixup, python3-snmpclitools,AUTHOR,"Lars Pedersen > ") > + @$(call install_fixup, python3-snmpclitools,DESCRIPTION,missing) > + > + @$(call install_glob, python3-snmpclitools, 0, 0, -, \ > + $(PYTHON3_SITEPACKAGES),, *.py) > + > + @$(call install_glob,python3-snmpclitools, 0, 0, -, \ > + /usr/bin/,*.py,) > + > + @$(call install_finish, python3-snmpclitools) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.31.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > -- 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 To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 1/4] python3-pyasn1: new package
Hi, On Mon, Jul 05, 2021 at 11:33:47AM +0200, Lars Pedersen wrote: > Pure-Python implementation of ASN.1 types and DER/BER/CER codecs > (X.208). New package used by python3-pysnmp > > Signed-off-by: Lars Pedersen > --- > rules/python3-pyasn1.in | 9 +++ > rules/python3-pyasn1.make | 53 +++ > 2 files changed, 62 insertions(+) > create mode 100644 rules/python3-pyasn1.in > create mode 100644 rules/python3-pyasn1.make > > diff --git a/rules/python3-pyasn1.in b/rules/python3-pyasn1.in > new file mode 100644 > index 0..a28e4e355 > --- /dev/null > +++ b/rules/python3-pyasn1.in > @@ -0,0 +1,9 @@ > +## SECTION=python3 > + > +config PYTHON3_PYASN1 > + bool > + prompt "pyasn1" > + select PYTHON3 > + select HOST_PYTHON3_SETUPTOOLS > + help > + Pure-Python implementation of ASN.1 types and DER/BER/CER codecs > (X.208) > diff --git a/rules/python3-pyasn1.make b/rules/python3-pyasn1.make > new file mode 100644 > index 0..9280856f4 > --- /dev/null > +++ b/rules/python3-pyasn1.make > @@ -0,0 +1,53 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2021 by Lars Pedersen > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PYTHON3_PYASN1) += python3-pyasn1 > + > +# > +# Paths and names > +# > +PYTHON3_PYASN1_VERSION := 0.4.8 > +PYTHON3_PYASN1_MD5 := dffae4ff9f997a83324b3f33fe62be54 > +PYTHON3_PYASN1 := pyasn1-$(PYTHON3_PYASN1_VERSION) > +PYTHON3_PYASN1_SUFFIX:= tar.gz > +PYTHON3_PYASN1_URL := $(call ptx/mirror-pypi, pyasn1, > $(PYTHON3_PYASN1).$(PYTHON3_PYASN1_SUFFIX)) > +PYTHON3_PYASN1_SOURCE:= > $(SRCDIR)/$(PYTHON3_PYASN1).$(PYTHON3_PYASN1_SUFFIX) > +PYTHON3_PYASN1_DIR := $(BUILDDIR)/$(PYTHON3_PYASN1) > +PYTHON3_PYASN1_LICENSE := BSD-2 The correct identifier is BSD-2-Clause here. - Roland > +PYTHON3_PYASN1_LICENSE_FILES := \ > + file://LICENSE.rst;md5=a14482d15c2249de3b6f0e8a47e021fd > + > +# > > +# Prepare > +# > > + > +PYTHON3_PYASN1_CONF_TOOL := python3 > + > +# > > +# Target-Install > +# > > +$(STATEDIR)/python3-pyasn1.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, python3-pyasn1) > + @$(call install_fixup, python3-pyasn1,PRIORITY,optional) > + @$(call install_fixup, python3-pyasn1,SECTION,base) > + @$(call install_fixup, python3-pyasn1,AUTHOR,"Lars Pedersen > ") > + @$(call install_fixup, python3-pyasn1,DESCRIPTION,missing) > + > + @$(call install_glob,python3-pyasn1, 0, 0, -, \ > + /usr/lib/python$(PYTHON3_MAJORMINOR)/site-packages,, *.py) > + > + @$(call install_finish, python3-pyasn1) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.31.1 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > -- 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 To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 2/2] python3-pycryptodomex: fix license identifier
LICENSE.rst includes an Unlicense and a BSD-2-Clause, and refers to additional licenses for the OCB code, which contains a restriction for "military purposes", and is not compatible with the Open Source Definition. Fixes: b8958ad388ba104527e2 (2021-07-02, "python3-pycryptodomex: new package") Cc: Lars Pedersen Signed-off-by: Roland Hieber --- rules/python3-pycryptodomex.make | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rules/python3-pycryptodomex.make b/rules/python3-pycryptodomex.make index 59dadfbd0d29..9409bb414e88 100644 --- a/rules/python3-pycryptodomex.make +++ b/rules/python3-pycryptodomex.make @@ -21,9 +21,12 @@ PYTHON3_PYCRYPTODOMEX_SUFFIX := tar.gz PYTHON3_PYCRYPTODOMEX_URL := $(call ptx/mirror-pypi, pycryptodomex, $(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX)) PYTHON3_PYCRYPTODOMEX_SOURCE := $(SRCDIR)/$(PYTHON3_PYCRYPTODOMEX).$(PYTHON3_PYCRYPTODOMEX_SUFFIX) PYTHON3_PYCRYPTODOMEX_DIR := $(BUILDDIR)/$(PYTHON3_PYCRYPTODOMEX) -PYTHON3_PYCRYPTODOMEX_LICENSE := BSD-2 +PYTHON3_PYCRYPTODOMEX_LICENSE := Unlicense AND BSD-2-Clause and proprietary PYTHON3_PYCRYPTODOMEX_LICENSE_FILES := \ - file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c + file://LICENSE.rst;md5=accfa6aeaceb3ba96676edf18e78302c \ + file://Doc/ocb/license1.pdf;md5=e33fa8dcf4d10e5c0d9a9e9291714d3d \ + file://Doc/ocb/license2.pdf;md5=68cfc4690fbbaa0d89d3ea3abcc60b0f \ + file://Doc/ocb/license3.pdf;md5=2124679d48d559681738985e040ae388 # # Prepare -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/2] ptxd_make_world_license: handle PDFs in _LICENSE_FILES
If PDF files are found in the _LICENSE_FILES variable, include them as
literal pages in license-report.pdf with the 'pdfpages' package, which
nowadays comes preinstalled with most LaTeX distributions.
Signed-off-by: Roland Hieber
---
scripts/lib/ptxd_make_license_report.sh | 2 ++
scripts/lib/ptxd_make_world_license.sh | 41 -
2 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/scripts/lib/ptxd_make_license_report.sh
b/scripts/lib/ptxd_make_license_report.sh
index c92dc725d1f7..bed5bd1d43c5 100644
--- a/scripts/lib/ptxd_make_license_report.sh
+++ b/scripts/lib/ptxd_make_license_report.sh
@@ -18,6 +18,7 @@ ptxd_make_license_report_header() {
\usepackage{tikz}
\usepackage{adjustbox}
\usepackage{spverbatim}
+ \usepackage{pdfpages}
\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue}
%% Something like this may be needed depending on the package list
@@ -209,6 +210,7 @@ ptxd_make_license_compliance_header() {
\usepackage{tikz}
\usepackage{adjustbox}
\usepackage{spverbatim}
+ \usepackage{pdfpages}
\hypersetup{colorlinks=true,linkcolor=blue,urlcolor=blue}
%% Something like this may be needed depending on the package list
diff --git a/scripts/lib/ptxd_make_world_license.sh
b/scripts/lib/ptxd_make_world_license.sh
index f68b75339cb2..785254603765 100644
--- a/scripts/lib/ptxd_make_world_license.sh
+++ b/scripts/lib/ptxd_make_world_license.sh
@@ -188,21 +188,32 @@ ptxd_make_world_license_write() {
continue
fi
title="$(basename "${license}")"
- cat <<- EOF
- \section{$(ptxd_make_latex_escape "${title}")${guess}}
- \begin{small}
- \begin{spverbatim}
- EOF
- if [ -f "${license}.utf-8" ]; then
- cat "${license}.utf-8"
- else
- cat "${license}"
- fi | sed -e 's/\f/\n/g'
- check_pipe_status || return
- cat <<- EOF
- \end{spverbatim}
- \end{small}
- EOF
+ case "${license}" in
+ *.pdf)
+ cat <<- EOF
+ \section{$(ptxd_make_latex_escape "${title}")${guess}}
+ \includepdf[pages=-]{${license}}
+ EOF
+ ;;
+ *)
+ cat <<- EOF
+ \section{$(ptxd_make_latex_escape "${title}")${guess}}
+ \begin{small}
+ \begin{spverbatim}
+ EOF
+
+ if [ -f "${license}.utf-8" ]; then
+ cat "${license}.utf-8"
+ else
+ cat "${license}"
+ fi | sed -e 's/\f/\n/g'
+ check_pipe_status || return
+ cat <<- EOF
+ \end{spverbatim}
+ \end{small}
+ EOF
+ ;;
+ esac
done
}
export -f ptxd_make_world_license_write
--
2.30.2
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] strongswan: version bump 5.8.4 -> 5.9.2
New configure option but is default disabled. --enable-git-version use output of 'git describe' as version information Signed-off-by: Lars Pedersen --- rules/strongswan.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/strongswan.make b/rules/strongswan.make index 59de1cfdb..a64e67cc8 100644 --- a/rules/strongswan.make +++ b/rules/strongswan.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_STRONGSWAN) += strongswan # # Paths and names # -STRONGSWAN_VERSION := 5.8.4 -STRONGSWAN_MD5 := 0634e7f40591bd3f6770e583c3f27d29 +STRONGSWAN_VERSION := 5.9.2 +STRONGSWAN_MD5 := 8918e6675e1be3784817641f07eadeb8 STRONGSWAN := strongswan-$(STRONGSWAN_VERSION) STRONGSWAN_SUFFIX := tar.bz2 STRONGSWAN_URL := https://download.strongswan.org/$(STRONGSWAN).$(STRONGSWAN_SUFFIX) -- 2.31.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
