Re: [ptxdist] [PATCH] machine-id: make using rc-once optional
On Fri, Nov 27, 2020 at 09:38:41AM +0100, Michael Olbrich wrote: > On Wed, Nov 25, 2020 at 05:56:49PM +0100, Artur Wiebe wrote: > > If not set only an empty /etc/machine-id will be installed. > > > > Signed-off-by: Artur Wiebe > > --- > > rules/machine-id.in | 22 ++ > > rules/machine-id.make | 4 > > rules/machine-id.postinst | 5 +++-- > > 3 files changed, 25 insertions(+), 6 deletions(-) > > > > diff --git a/rules/machine-id.in b/rules/machine-id.in > > index f18fec554..2a3901f41 100644 > > --- a/rules/machine-id.in > > +++ b/rules/machine-id.in > > @@ -1,11 +1,25 @@ > > ## SECTION=initmethod > > > > -config MACHINE_ID > > +menuconfig MACHINE_ID > > tristate > > prompt "create /etc/machine-id" > > - select RC_ONCE if RUNTIME > > - select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD > > - select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD > > + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME > > + select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && > > !INITMETHOD_SYSTEMD > > + select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && > > !INITMETHOD_SYSTEMD > > help > > Enable this to make sure there is always a unique /etc/machine-id > > available in the system. > > + > > +if MACHINE_ID > > + > > +config MACHINE_ID_RC_ONCE > > + bool "generate (bbinit) or save (systemd) machine-id using rc-once at > > first boot" > > + default y > > Hmmm, maybe should have no prompt and 'depends on RC_ONCE' (instead of > selecting it above). I don't think there is a use-case for not persisting > the machine-id if rc-once is available. Well, one of my systems has a service for that. Machine-id is generated using hardware info. In that case I do not mind as RC_ONCE is not selected, but there is a use-case in general. However it is still possible to override rules/machine-id.in in BSP, so... > This is different from the ssh server key case: There are other ways to > create the keys. There are other ways to create machine-id too... ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] ?==?utf-8?q? ?==?utf-8?q? [PATCH] machine-id: make using rc-once optional
Hi Michael, On Friday, November 27, 2020 09:38 CET, Michael Olbrich wrote: > On Wed, Nov 25, 2020 at 05:56:49PM +0100, Artur Wiebe wrote: > > If not set only an empty /etc/machine-id will be installed. > > > > Signed-off-by: Artur Wiebe > > --- > > rules/machine-id.in | 22 ++ > > rules/machine-id.make | 4 > > rules/machine-id.postinst | 5 +++-- > > 3 files changed, 25 insertions(+), 6 deletions(-) > > > > diff --git a/rules/machine-id.in b/rules/machine-id.in > > index f18fec554..2a3901f41 100644 > > --- a/rules/machine-id.in > > +++ b/rules/machine-id.in > > @@ -1,11 +1,25 @@ > > ## SECTION=initmethod > > > > -config MACHINE_ID > > +menuconfig MACHINE_ID > > tristate > > prompt "create /etc/machine-id" > > - select RC_ONCE if RUNTIME > > - select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD > > - select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD > > + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME > > + select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && > > !INITMETHOD_SYSTEMD > > + select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && > > !INITMETHOD_SYSTEMD > > help > > Enable this to make sure there is always a unique /etc/machine-id > > available in the system. > > + > > +if MACHINE_ID > > + > > +config MACHINE_ID_RC_ONCE > > + bool "generate (bbinit) or save (systemd) machine-id using rc-once at > > first boot" > > + default y > > Hmmm, maybe should have no prompt and 'depends on RC_ONCE' (instead of > selecting it above). I don't think there is a use-case for not persisting > the machine-id if rc-once is available. > > This is different from the ssh server key case: There are other ways to > create the keys. Why should one select rc-once, if it is not needed by any other package? Maybe make it even invisible? In my projects I use an initramfs where I mount an overlayfs over /etc. When systemd starts /etc/mancine-id is writable while / is never mounted rw. So I want just to install an empty /etc/machine-id and let systemd generate and write the new one. rc-once just jeopardize this. > > > + help > > + If not set only an empty /etc/machine-id will be installed. > > + Systemd: > > + If /etc/machine-id exists and is empty, systemd will bind-mount > > + a file containing the new machine-id over it and later try > > + to commit it to disk (if /etc/ is writable). > > + > > +endif > > diff --git a/rules/machine-id.make b/rules/machine-id.make > > index 3883d64cb..e1cbdcc42 100644 > > --- a/rules/machine-id.make > > +++ b/rules/machine-id.make > > @@ -27,7 +27,11 @@ $(STATEDIR)/machine-id.targetinstall: > > @$(call install_fixup,machine-id,AUTHOR,"Michael Olbrich > > ") > > @$(call install_fixup,machine-id,DESCRIPTION,missing) > > > > + @$(call install_copy, machine-id, 0, 0, 0644, /dev/null, > > /etc/machine-id) > > Maybe install_alternative and an empty on in projectroot/. Sometimes it's > better to share the same machine-id across devices than having a new one > after rebooting. Good idea. I'll change this. > > Also, this should only happen for !PTXCONF_MACHINE_ID_RC_ONCE. It's not a > good idea to modify files that are installed by a package. This is the case for almost all files in /etc if they are modified on the target. I avoid it with the overlayfs. In this way defaults are installed by the packages and changes are stored on the target. > > > + > > +ifdef MACHINE_ID_RC_ONCE > > ifdef PTXCONF_MACHINE_ID_RC_ONCE > > > @$(call install_alternative, machine-id, 0, 0, 0755, > > /etc/rc.once.d/machine-id) > > +endif > > > > @$(call install_finish,machine-id) > > > > diff --git a/rules/machine-id.postinst b/rules/machine-id.postinst > > index 2060129d1..f1648226b 100644 > > --- a/rules/machine-id.postinst > > +++ b/rules/machine-id.postinst > > @@ -1,3 +1,4 @@ > > #!/bin/sh > > -touch "$DESTDIR/etc/machine-id" > > So this is still needed inside the 'if'. I moved it into the package because otherwise an empty package is not generated. ERROR: no files installed With this patch machine-id would be reset on reinstall, but why should someone reinstall the machine-id package? Artur > > Michael > > > -$DESTDIR/usr/sbin/enable-rc-once machine-id > > +if [ -f $DESTDIR/etc/rc.once.d/machine-id ]; then > > + $DESTDIR/usr/sbin/enable-rc-once machine-id > > +fi > > -- > > 2.29.2 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to > > ptxdist-requ...@pengutronix.de > > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a
Re: [ptxdist] [APPLIED] cog: version bump 0.7.1 -> 0.8.0
Thanks, applied as 1971a748177952477cd81c85ce5de47b7f6f4387. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:19 +0100, Marco Felsch wrote: > Signed-off-by: Marco Felsch > Message-Id: <20201120073713.28019-1-m.fel...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/cog.make b/rules/cog.make > index e0e0707b647c..876909cc505d 100644 > --- a/rules/cog.make > +++ b/rules/cog.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog > # > # Paths and names > # > -COG_VERSION := 0.7.1 > -COG_MD5 := f2c51cd444ca54d8042e99b3e8a3fa78 > +COG_VERSION := 0.8.0 > +COG_MD5 := f7aa8a425927cab247563411fc67c5a3 > COG := cog-$(COG_VERSION) > COG_SUFFIX := tar.xz > COG_URL := > https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX) ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] Bugfix: python3-urllib3: wrong location
Thanks, applied as 88069189770bb69d679fc2f5b712bcd549f25e72.
Michael
[sent from post-receive hook]
On Fri, 27 Nov 2020 09:39:20 +0100, Lars Pedersen wrote:
> Fixes: 70199fad77ee ("python3-urllib3: new package")
>
> For some reason the patch ended up in the wrong location.
>
> Signed-off-by: Lars Pedersen
> Message-Id: <20201124095646.22087-1-lape...@gmail.com>
> Signed-off-by: Michael Olbrich
>
> diff --git a/python3-urllib3.in b/rules/python3-urllib3.in
> similarity index 100%
> rename from python3-urllib3.in
> rename to rules/python3-urllib3.in
> diff --git a/python3-urllib3.make b/rules/python3-urllib3.make
> similarity index 100%
> rename from python3-urllib3.make
> rename to rules/python3-urllib3.make
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] piglit: add PYTHON3_SSL dependency
Thanks, applied as abfa8116f37e1a180539f2d633fc06e1714ec4dd. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:18 +0100, Lucas Stach wrote: > Newer versions of the piglit runner require hashlib on the target. > > Signed-off-by: Lucas Stach > Message-Id: <20201119104055.31981-1-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/piglit.in b/rules/piglit.in > index c4414d545cc2..397585c5d26b 100644 > --- a/rules/piglit.in > +++ b/rules/piglit.in > @@ -15,6 +15,7 @@ menuconfig PIGLIT > select PYTHON3_LZMA > select PYTHON3_MAKO > select PYTHON3_SIX > + select PYTHON3_SSL > select WAFFLE > select WAYLAND if PIGLIT_WAYLAND > select LIBXKBCOMMON if PIGLIT_WAYLAND ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] modemmanager: version bump 1.14.6 -> 1.14.8
Thanks, applied as 1814b00bb3380d30ec6cf87c319f6fc819c7cd77. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:17 +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: <20201119094632.GA925164@lenoch> > Signed-off-by: Michael Olbrich > > diff --git a/rules/modemmanager.make b/rules/modemmanager.make > index ec475b121206..09b3bc422306 100644 > --- a/rules/modemmanager.make > +++ b/rules/modemmanager.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager > # > # Paths and names > # > -MODEMMANAGER_VERSION := 1.14.6 > -MODEMMANAGER_MD5 := fdeef6399ab8937e5e0e09740d4a6585 > +MODEMMANAGER_VERSION := 1.14.8 > +MODEMMANAGER_MD5 := 138762a976a654d244744963d2250372 > MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) > MODEMMANAGER_SUFFIX := tar.xz > MODEMMANAGER_URL := > https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] python3-adbus: new package
Thanks, applied as 084a8d1125b4d2df39ef839b18c6c74acab39b6f. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:16 +0100, Lars Pedersen wrote: > D-Bus Binding for Python utilizing the Python’s asyncio module. Requires > libsystemd (sd-bus). > > Signed-off-by: Lars Pedersen > Message-Id: <20201117132656.87886-1-lape...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/python3-adbus.in b/rules/python3-adbus.in > new file mode 100644 > index ..47b7e5c81ab0 > --- /dev/null > +++ b/rules/python3-adbus.in > @@ -0,0 +1,11 @@ > +## SECTION=python3 > + > +config PYTHON3_ADBUS > + tristate > + prompt "python3-adbus" > + select PYTHON3 > + select HOST_PYTHON3_SETUPTOOLS > + select HOST_CYTHON3 > + select SYSTEMD > + help > + D-Bus Binding for Python using systemd sd-bus API and utilizing the > Python's asyncio module. > diff --git a/rules/python3-adbus.make b/rules/python3-adbus.make > new file mode 100644 > index ..6f0dd91b77a8 > --- /dev/null > +++ b/rules/python3-adbus.make > @@ -0,0 +1,55 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2020 by Lars Pedersen > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PYTHON3_ADBUS) += python3-adbus > + > +# > +# Paths and names > +# > +PYTHON3_ADBUS_VERSION:= 1.1.3 > +PYTHON3_ADBUS_MD5:= 6802bdf83110edaf3b76dcd00f7aadbf > +PYTHON3_ADBUS:= adbus-$(PYTHON3_ADBUS_VERSION) > +PYTHON3_ADBUS_SUFFIX := tar.gz > +PYTHON3_ADBUS_URL:= $(call ptx/mirror-pypi, adbus, > $(PYTHON3_ADBUS).$(PYTHON3_ADBUS_SUFFIX)) > +PYTHON3_ADBUS_SOURCE := $(SRCDIR)/$(PYTHON3_ADBUS).$(PYTHON3_ADBUS_SUFFIX) > +PYTHON3_ADBUS_DIR:= $(BUILDDIR)/$(PYTHON3_ADBUS) > +PYTHON3_ADBUS_LICENSE:= MIT > +PYTHON3_ADBUS_LICENSE_FILES := \ > + file://LICENSE;md5=da428c97c811cd93a27a66732d9597ed > + > + > +# > > +# Prepare > +# > > + > +PYTHON3_ADBUS_CONF_TOOL := python3 > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/python3-adbus.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, python3-adbus) > + @$(call install_fixup, python3-adbus,PRIORITY,optional) > + @$(call install_fixup, python3-adbus,SECTION,base) > + @$(call install_fixup, python3-adbus,AUTHOR,"Lars Pedersen > ") > + @$(call install_fixup, python3-adbus,DESCRIPTION,missing) > + > + @$(call install_glob, python3-adbus, 0, 0, -, \ > + $(PYTHON3_SITEPACKAGES),, *.py) > + > + @$(call install_finish, python3-adbus) > + > + @$(call touch) > + > +# vim: syntax=make ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] openssh: fix INITMETHOD dependencies
Thanks, applied as 5d5fdbd3c20412adc686624311397cdff401b926. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:15 +0100, Artur Wiebe wrote: > Signed-off-by: Artur Wiebe > Message-Id: <20201116191441.241004-1-ar...@4wiebe.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/openssh.in b/rules/openssh.in > index 37013250cd8b..b04a7a8a502e 100644 > --- a/rules/openssh.in > +++ b/rules/openssh.in > @@ -40,13 +40,13 @@ config OPENSSH_SSHD > config OPENSSH_SSHD_STARTSCRIPT > bool > default y > - depends on OPENSSH_SSHD > + depends on OPENSSH_SSHD && INITMETHOD_BBINIT > prompt "install /etc/init.d/openssh" > > config OPENSSH_SSHD_SYSTEMD_UNIT > bool > default y > - depends on OPENSSH_SSHD && SYSTEMD > + depends on OPENSSH_SSHD && INITMETHOD_SYSTEMD > prompt "install systemd unit files for sshd" > > config OPENSSH_SSHD_GENKEYS ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] wpewebkit: version bump 2.30.1 -> 2.30.2
Thanks, applied as 177451a5d9e20dc71a250bf5221dfab31f2d60e1. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:13 +0100, Bastian Krause wrote: > Signed-off-by: Bastian Krause > Message-Id: <20201116122123.26777-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch > > b/patches/wpewebkit-2.30.2/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch > similarity index 100% > rename from > patches/wpewebkit-2.30.1/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch > rename to > patches/wpewebkit-2.30.2/0001-WebProcess-InjectedBundle-guard-setGenericCueAPIEnab.patch > diff --git a/patches/wpewebkit-2.30.1/series b/patches/wpewebkit-2.30.2/series > similarity index 100% > rename from patches/wpewebkit-2.30.1/series > rename to patches/wpewebkit-2.30.2/series > diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make > index 2b8f8cd8b78d..a95efb209d0e 100644 > --- a/rules/wpewebkit.make > +++ b/rules/wpewebkit.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit > # > # Paths and names > # > -WPEWEBKIT_VERSION:= 2.30.1 > -WPEWEBKIT_MD5:= 251228a6e2917eff90a3eb6e9a7e920d > +WPEWEBKIT_VERSION:= 2.30.2 > +WPEWEBKIT_MD5:= 5b0fedb53dbb36e572935fd54a7b > WPEWEBKIT:= wpewebkit-$(WPEWEBKIT_VERSION) > WPEWEBKIT_SUFFIX := tar.xz > WPEWEBKIT_URL:= > https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX) ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] piglit: switch to ninja build
Thanks, applied as 655a0a4b3f4e144bc55cac29244108cb0d08766f. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:12 +0100, Lucas Stach wrote: > Seems to work fine here and is quite a bit faster than the > cmake native build. > > Signed-off-by: Lucas Stach > Message-Id: <20201116120627.17891-4-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/piglit.in b/rules/piglit.in > index 889765ee55af..c4414d545cc2 100644 > --- a/rules/piglit.in > +++ b/rules/piglit.in > @@ -4,6 +4,7 @@ menuconfig PIGLIT > tristate > prompt "piglit" > select HOST_CMAKE > + select HOST_NINJA > select HOST_SYSTEM_PYTHON3 > select HOST_SYSTEM_PYTHON3_MAKO > select HOST_SYSTEM_PYTHON3_NUMPY > diff --git a/rules/piglit.make b/rules/piglit.make > index 1f000cd467b0..9be2826493c0 100644 > --- a/rules/piglit.make > +++ b/rules/piglit.make > @@ -31,6 +31,7 @@ PIGLIT_BUILD_OOT:= NO > PIGLIT_CONF_TOOL := cmake > > PIGLIT_CONF_OPT := $(CROSS_CMAKE_USR) \ > + -G Ninja \ > -DPYTHON_EXECUTABLE:FILEPATH=$(SYSTEMPYTHON3) \ > -DPIGLIT_USE_WAFFLE=1 \ > -DPIGLIT_BUILD_GL_TESTS=$(call ptx/ifdef, > PTXCONF_PIGLIT_TESTS_OPENGL,1,0) \ ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] openssh: make host key generation optional
Thanks, applied as abfc4e40a6c5358d00a7f0e24b4b10888b7e8090. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:14 +0100, Artur Wiebe wrote: > If not set host keys must be provided in some other way > (otherwise sshd will not start) > > Signed-off-by: Artur Wiebe > Acked-by: Roland Hieber > Message-Id: <20201116191113.239636-1-ar...@4wiebe.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/openssh.in b/rules/openssh.in > index 09f5c1d7..37013250cd8b 100644 > --- a/rules/openssh.in > +++ b/rules/openssh.in > @@ -6,10 +6,10 @@ menuconfig OPENSSH > select OPENSSL > select LIBC_CRYPT > select LIBC_UTIL > - select RC_ONCE if OPENSSH_SSHD && RUNTIME > + select RC_ONCE if OPENSSH_SSHD_GENKEYS && RUNTIME > select BUSYBOX_START_STOP_DAEMON if OPENSSH_SSHD_STARTSCRIPT > select LIBSELINUX if GLOBAL_SELINUX > - select OPENSSH_KEYGEN if OPENSSH_SSHD > + select OPENSSH_KEYGEN if OPENSSH_SSHD_GENKEYS > prompt "openssh " > help > secure shell client/server, an rlogin/rsh/rcp replacement > @@ -49,6 +49,14 @@ config OPENSSH_SSHD_SYSTEMD_UNIT > depends on OPENSSH_SSHD && SYSTEMD > prompt "install systemd unit files for sshd" > > +config OPENSSH_SSHD_GENKEYS > + bool "generate sshd host keys at first boot" > + default y > + depends on OPENSSH_SSHD > + help > + If not set host keys must be provided in some other way > + (otherwise sshd will not start) > + > config OPENSSH_SCP > bool "scp" > help > diff --git a/rules/openssh.make b/rules/openssh.make > index cae04487f8af..99fca3f4600f 100644 > --- a/rules/openssh.make > +++ b/rules/openssh.make > @@ -105,8 +105,10 @@ ifdef PTXCONF_OPENSSH_SSHD > /etc/ssh/moduli) > @$(call install_copy, openssh, 0, 0, 0755, -, \ > /usr/sbin/sshd) > +ifdef PTXCONF_OPENSSH_SSHD_GENKEYS > @$(call install_alternative, openssh, 0, 0, 0755, > /etc/rc.once.d/openssh) > endif > +endif > > ifdef PTXCONF_INITMETHOD_BBINIT > ifdef PTXCONF_OPENSSH_SSHD_STARTSCRIPT > diff --git a/rules/openssh.postinst b/rules/openssh.postinst > index fcfbf9149342..a7bbf1c5889b 100644 > --- a/rules/openssh.postinst > +++ b/rules/openssh.postinst > @@ -1,2 +1,4 @@ > #!/bin/sh > -$DESTDIR/usr/sbin/enable-rc-once openssh > +if [ -f $DESTDIR/etc/rc.once.d/openssh ]; then > + $DESTDIR/usr/sbin/enable-rc-once openssh > +fi ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] piglit: drop freeglut dependency
Thanks, applied as 3f15da24a862abad14cdfd03a93847e42a7b23ac. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:11 +0100, Lucas Stach wrote: > We always build piglit with libwaffle support, so the freeglut based > winsys in never built. Drop the dependency. > > Signed-off-by: Lucas Stach > Message-Id: <20201116120627.17891-3-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/piglit.in b/rules/piglit.in > index d4577200d458..889765ee55af 100644 > --- a/rules/piglit.in > +++ b/rules/piglit.in > @@ -17,7 +17,6 @@ menuconfig PIGLIT > select WAFFLE > select WAYLAND if PIGLIT_WAYLAND > select LIBXKBCOMMON if PIGLIT_WAYLAND > - select FREEGLUT if PIGLIT_TESTS_OPENGL > select MESALIB_GLX if PIGLIT_TESTS_OPENGL > select MESALIB_OPENGL if PIGLIT_TESTS_OPENGL > select XORG if PIGLIT_TESTS_OPENGL ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] waffle: version bump 1.5.2 -> 1.6.1
Thanks, applied as 1312352dbe18d42b95910c95b4a00b815cda2f3f.
Michael
[sent from post-receive hook]
On Fri, 27 Nov 2020 09:39:09 +0100, Lucas Stach wrote:
> - version bump
> - use ptx/onoff configuration helper
>
> Signed-off-by: Lucas Stach
> Message-Id: <20201116120627.17891-2-l.st...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git
> a/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
> b/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
> deleted file mode 100644
> index 30759ce4e427..
> ---
> a/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -From 359902f8f043e7a7d782d1df3d5d74c3b2a3bd04 Mon Sep 17 00:00:00 2001
> -From: Philipp Zabel
> -Date: Thu, 8 Jun 2017 13:52:02 +0200
> -Subject: [PATCH] egl: use EGL CFLAGS reported by pkg-config
> -
> -Some platforms need -DMESA_EGL_NO_X11_HEADERS set, as indicated by the
> -Cflags: field in egl.pc. pkg-config provides this information, pass it
> -to the compiler.
> -
> -Signed-off-by: Philipp Zabel
>
> - src/waffle/CMakeLists.txt | 5 +
> - 1 file changed, 5 insertions(+)
> -
> -diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
> -index d76e029..954774c 100644
> a/src/waffle/CMakeLists.txt
> -+++ b/src/waffle/CMakeLists.txt
> -@@ -94,6 +94,9 @@ if(waffle_on_mac)
> - endif()
> -
> - if(waffle_has_egl)
> -+list(APPEND waffle_cflags
> -+${egl_CFLAGS}
> -+)
> - list(APPEND waffle_sources
> - egl/wegl_config.c
> - egl/wegl_context.c
> -@@ -227,6 +230,7 @@ target_link_libraries(${waffle_libname}
> ${waffle_libdeps})
> -
> - set_target_properties(${waffle_libname}
> - PROPERTIES
> -+COMPILE_FLAGS ${waffle_cflags}
> - SOVERSION ${waffle_soversion}
> - VERSION
> ${waffle_soversion}.${waffle_minor_version}.${waffle_patch_version}
> - )
> -@@ -266,6 +270,7 @@ target_link_libraries(waffle_static ${waffle_libdeps})
> -
> - set_target_properties(waffle_static
> - PROPERTIES
> -+COMPILE_FLAGS ${waffle_cflags}
> - OUTPUT_NAME "waffle-static-${waffle_major_version}"
> - )
> -
> ---
> -2.11.0
> -
> diff --git a/patches/waffle-1.5.2/series b/patches/waffle-1.5.2/series
> deleted file mode 100644
> index 6b680e422f5a..
> --- a/patches/waffle-1.5.2/series
> +++ /dev/null
> @@ -1 +0,0 @@
> -0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch
> diff --git a/rules/waffle.make b/rules/waffle.make
> index f2c72420793f..7a384476ecc7 100644
> --- a/rules/waffle.make
> +++ b/rules/waffle.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAFFLE) += waffle
> #
> # Paths and names
> #
> -WAFFLE_VERSION := 1.5.2
> -WAFFLE_MD5 := c669c91bf2f7e13a5d781c3dbb30fd8c
> +WAFFLE_VERSION := 1.6.1
> +WAFFLE_MD5 := c91529e579483f44fb330052872b9c73
> WAFFLE := waffle-$(WAFFLE_VERSION)
> WAFFLE_SUFFIX:= tar.xz
> WAFFLE_URL :=
> http://www.waffle-gl.org/files/release/$(WAFFLE)/$(WAFFLE).$(WAFFLE_SUFFIX)
> @@ -32,10 +32,16 @@ WAFFLE_LICENSE_FILES := \
> WAFFLE_CONF_TOOL := cmake
> WAFFLE_CONF_OPT := \
> $(CROSS_CMAKE_USR) \
> - -Dwaffle_has_glx=$(call ptx/ifdef,PTXCONF_WAFFLE_GLX,1,0) \
> - -Dwaffle_has_wayland=$(call ptx/ifdef,PTXCONF_WAFFLE_WAYLAND,1,0) \
> - -Dwaffle_has_x11_egl=$(call ptx/ifdef,PTXCONF_WAFFLE_X11_EGL,1,0) \
> - -Dwaffle_has_gbm=$(call ptx/ifdef,PTXCONF_WAFFLE_GBM,1,0)
> + -Dwaffle_build_examples=OFF \
> + -Dwaffle_build_htmldocs=OFF \
> + -Dwaffle_build_manpages=OFF \
> + -Dwaffle_build_tests=OFF \
> + -Dwaffle_has_gbm=$(call ptx/onoff,PTXCONF_WAFFLE_GBM) \
> + -Dwaffle_has_glx=$(call ptx/onoff,PTXCONF_WAFFLE_GLX) \
> + -Dwaffle_has_nacl=OFF \
> + -Dwaffle_has_surfaceless_egl=OFF \
> + -Dwaffle_has_wayland=$(call ptx/onoff,PTXCONF_WAFFLE_WAYLAND) \
> + -Dwaffle_has_x11_egl=$(call ptx/onoff,PTXCONF_WAFFLE_X11_EGL) \
>
>
> #
>
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] xcb-proto: version bump 1.13 -> 1.14.1
Thanks, applied as 7978b087de8b7f07f8e7a5fd5a05c9e2a17180b8. Michael [sent from post-receive hook] On Fri, 27 Nov 2020 09:39:08 +0100, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20201116120627.17891-1-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/xcb-proto.make b/rules/xcb-proto.make > index ca54478561c9..fa0e0b97c64b 100644 > --- a/rules/xcb-proto.make > +++ b/rules/xcb-proto.make > @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_XCB_PROTO) += xcb-proto > # > # Paths and names > # > -XCB_PROTO_VERSION:= 1.13 > -XCB_PROTO_MD5:= abe9aa4886138150bbc04ae4f29b90e3 > +XCB_PROTO_VERSION:= 1.14.1 > +XCB_PROTO_MD5:= ecd6955dab1a7b9ba9756a11b8bdb48f > XCB_PROTO:= xcb-proto-$(XCB_PROTO_VERSION) > -XCB_PROTO_SUFFIX := tar.bz2 > -XCB_PROTO_URL:= > http://xcb.freedesktop.org/dist/$(XCB_PROTO).$(XCB_PROTO_SUFFIX) > +XCB_PROTO_SUFFIX := tar.xz > +XCB_PROTO_URL:= > http://xorg.freedesktop.org/archive/individual/proto/$(XCB_PROTO).$(XCB_PROTO_SUFFIX) > XCB_PROTO_SOURCE := $(SRCDIR)/$(XCB_PROTO).$(XCB_PROTO_SUFFIX) > XCB_PROTO_DIR:= $(BUILDDIR)/$(XCB_PROTO) > XCB_PROTO_LICENSE:= MIT ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [APPLIED] ptxd_make_fit_image: Add support for kernel load/entry addresses
Thanks, applied as b5515256f0b1c49c28a2939a15e6b5401c78efc1.
Michael
[sent from post-receive hook]
On Fri, 27 Nov 2020 09:39:06 +0100, Alex Vazquez wrote:
> Make it possible to specify load/entry addresses for the kernel.
> These are required by the FIT image specification, but in some cases
> users may not want to include them, so they are made optional.
>
> Also add mandatory "os" property for kernel and ramdisk.
>
> Signed-off-by: AVazquez
> Message-Id: <1605526881-13215-1-git-send-email-avazquez@gmail.com>
> Signed-off-by: Michael Olbrich
>
> diff --git a/platforms/kernel-fit.in b/platforms/kernel-fit.in
> index 8cbc1a85a9dd..9585ce64a1ec 100644
> --- a/platforms/kernel-fit.in
> +++ b/platforms/kernel-fit.in
> @@ -17,6 +17,18 @@ menuconfig KERNEL_FIT
>
> if KERNEL_FIT
>
> +config KERNEL_FIT_LOAD
> + string
> + prompt "Kernel load address (optional)"
> + help
> + Required by most bootloaders. Optional for Barebox.
> +
> +config KERNEL_FIT_ENTRY
> + string
> + prompt "Kernel entry address (optional)"
> + help
> + Required by most bootloaders. Optional for Barebox.
> +
> config KERNEL_FIT_SIGNED
> bool
> prompt "sign FIT image"
> diff --git a/scripts/lib/ptxd_make_fit_image.sh
> b/scripts/lib/ptxd_make_fit_image.sh
> index 9754d1e84630..af535665d7b2 100644
> --- a/scripts/lib/ptxd_make_fit_image.sh
> +++ b/scripts/lib/ptxd_make_fit_image.sh
> @@ -21,7 +21,20 @@ ptxd_make_image_fit_its() {
> data = /incbin/("${image_kernel}");
> type = "kernel";
> arch = "$(ptxd_get_ptxconf PTXCONF_ARCH_STRING)";
> + os = "linux";
> compression = "none";
> +EOF
> +if [ -n "$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_LOAD)" ]; then
> +cat << EOF
> + load = <$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_LOAD)>;
> +EOF
> +fi
> +if [ -n "$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_ENTRY)" ]; then
> +cat << EOF
> + entry = <$(ptxd_get_ptxconf PTXCONF_KERNEL_FIT_ENTRY)>;
> +EOF
> +fi
> +cat << EOF
> hash-1 {
> algo = "sha256";
> };
> @@ -33,6 +46,7 @@ EOF
> description = "initramfs";
> data = /incbin/("${image_initramfs}");
> type = "ramdisk";
> + os = "linux";
> compression = "none";
> hash-1 {
> algo = "sha256";
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] machine-id: make using rc-once optional
On Wed, Nov 25, 2020 at 05:56:49PM +0100, Artur Wiebe wrote: > If not set only an empty /etc/machine-id will be installed. > > Signed-off-by: Artur Wiebe > --- > rules/machine-id.in | 22 ++ > rules/machine-id.make | 4 > rules/machine-id.postinst | 5 +++-- > 3 files changed, 25 insertions(+), 6 deletions(-) > > diff --git a/rules/machine-id.in b/rules/machine-id.in > index f18fec554..2a3901f41 100644 > --- a/rules/machine-id.in > +++ b/rules/machine-id.in > @@ -1,11 +1,25 @@ > ## SECTION=initmethod > > -config MACHINE_ID > +menuconfig MACHINE_ID > tristate > prompt "create /etc/machine-id" > - select RC_ONCE if RUNTIME > - select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD > - select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD > + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME > + select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && > !INITMETHOD_SYSTEMD > + select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && > !INITMETHOD_SYSTEMD > help > Enable this to make sure there is always a unique /etc/machine-id > available in the system. > + > +if MACHINE_ID > + > +config MACHINE_ID_RC_ONCE > + bool "generate (bbinit) or save (systemd) machine-id using rc-once at > first boot" > + default y Hmmm, maybe should have no prompt and 'depends on RC_ONCE' (instead of selecting it above). I don't think there is a use-case for not persisting the machine-id if rc-once is available. This is different from the ssh server key case: There are other ways to create the keys. > + help > + If not set only an empty /etc/machine-id will be installed. > + Systemd: > + If /etc/machine-id exists and is empty, systemd will bind-mount > + a file containing the new machine-id over it and later try > + to commit it to disk (if /etc/ is writable). > + > +endif > diff --git a/rules/machine-id.make b/rules/machine-id.make > index 3883d64cb..e1cbdcc42 100644 > --- a/rules/machine-id.make > +++ b/rules/machine-id.make > @@ -27,7 +27,11 @@ $(STATEDIR)/machine-id.targetinstall: > @$(call install_fixup,machine-id,AUTHOR,"Michael Olbrich > ") > @$(call install_fixup,machine-id,DESCRIPTION,missing) > > + @$(call install_copy, machine-id, 0, 0, 0644, /dev/null, > /etc/machine-id) Maybe install_alternative and an empty on in projectroot/. Sometimes it's better to share the same machine-id across devices than having a new one after rebooting. Also, this should only happen for !PTXCONF_MACHINE_ID_RC_ONCE. It's not a good idea to modify files that are installed by a package. > + > +ifdef MACHINE_ID_RC_ONCE ifdef PTXCONF_MACHINE_ID_RC_ONCE > @$(call install_alternative, machine-id, 0, 0, 0755, > /etc/rc.once.d/machine-id) > +endif > > @$(call install_finish,machine-id) > > diff --git a/rules/machine-id.postinst b/rules/machine-id.postinst > index 2060129d1..f1648226b 100644 > --- a/rules/machine-id.postinst > +++ b/rules/machine-id.postinst > @@ -1,3 +1,4 @@ > #!/bin/sh > -touch "$DESTDIR/etc/machine-id" So this is still needed inside the 'if'. Michael > -$DESTDIR/usr/sbin/enable-rc-once machine-id > +if [ -f $DESTDIR/etc/rc.once.d/machine-id ]; then > + $DESTDIR/usr/sbin/enable-rc-once machine-id > +fi > -- > 2.29.2 > > > ___ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to > ptxdist-requ...@pengutronix.de > ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
