[OE-core][PATCH 1/4] systemd: sort packages before pn

[OE-core][PATCH 1/4] systemd: sort packages before pn

[Jose Quaresma]

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 meta/recipes-core/systemd/systemd_254.4.bb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb
index 77724eb822..d24bf0cb06 100644
--- a/meta/recipes-core/systemd/systemd_254.4.bb
+++ b/meta/recipes-core/systemd/systemd_254.4.bb
@@ -384,20 +384,20 @@ python populate_packages:prepend (){
 PACKAGES_DYNAMIC += "^lib(udev|systemd|nss).*"
 
 PACKAGE_BEFORE_PN = "\
-    ${PN}-gui \
-    ${PN}-vconsole-setup \
-    ${PN}-initramfs \
     ${PN}-analyze \
-    ${PN}-kernel-install \
-    ${PN}-rpm-macros \
     ${PN}-binfmt \
-    ${PN}-zsh-completion \
     ${PN}-container \
+    ${PN}-extra-utils \
+    ${PN}-gui \
+    ${PN}-initramfs \
     ${PN}-journal-gatewayd \
     ${PN}-journal-upload \
     ${PN}-journal-remote \
-    ${PN}-extra-utils \
+    ${PN}-kernel-install \
+    ${PN}-rpm-macros \
     ${PN}-udev-rules \
+    ${PN}-vconsole-setup \
+    ${PN}-zsh-completion \
     libsystemd-shared \
     udev \
     udev-hwdb \
-- 
2.42.0

[OE-core][PATCH 2/4] systemd: add systemd-crypt package

[Jose Quaresma]

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 meta/recipes-core/systemd/systemd_254.4.bb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb
index d24bf0cb06..2146c130d5 100644
--- a/meta/recipes-core/systemd/systemd_254.4.bb
+++ b/meta/recipes-core/systemd/systemd_254.4.bb
@@ -387,6 +387,7 @@ PACKAGE_BEFORE_PN = "\
     ${PN}-analyze \
     ${PN}-binfmt \
     ${PN}-container \
+    ${PN}-crypt \
     ${PN}-extra-utils \
     ${PN}-gui \
     ${PN}-initramfs \
@@ -446,6 +447,11 @@ USERADD_PARAM:${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin sys
 
 FILES:${PN}-analyze = "${bindir}/systemd-analyze"
 
+FILES:${PN}-crypt = "${bindir}/systemd-cryptenroll \
+                     ${nonarch_libdir}/cryptsetup \
+                    "
+RRECOMMENDS:${PN} += "${PN}-crypt"
+
 FILES:${PN}-initramfs = "/init"
 RDEPENDS:${PN}-initramfs = "${PN}"
 
@@ -552,7 +558,6 @@ FILES:${PN}-extra-utils = "\
                         ${bindir}/systemd-run \
                         ${bindir}/systemd-cat \
                         ${bindir}/systemd-creds \
-                        ${bindir}/systemd-cryptenroll \
                         ${bindir}/systemd-delta \
                         ${bindir}/systemd-cgls \
                         ${bindir}/systemd-cgtop \
-- 
2.42.0

[OE-core][PATCH 3/4] systemd: add cryptsetup-plugins package config

[Jose Quaresma]

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 meta/recipes-core/systemd/systemd_254.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb
index 2146c130d5..578d3b463d 100644
--- a/meta/recipes-core/systemd/systemd_254.4.bb
+++ b/meta/recipes-core/systemd/systemd_254.4.bb
@@ -135,6 +135,7 @@ PACKAGECONFIG[bzip2] = "-Dbzip2=true,-Dbzip2=false,bzip2"
 PACKAGECONFIG[cgroupv2] = "-Ddefault-hierarchy=unified,-Ddefault-hierarchy=hybrid"
 PACKAGECONFIG[coredump] = "-Dcoredump=true,-Dcoredump=false"
 PACKAGECONFIG[cryptsetup] = "-Dlibcryptsetup=true,-Dlibcryptsetup=false,cryptsetup,,cryptsetup"
+PACKAGECONFIG[cryptsetup-plugins] = "-Dlibcryptsetup-plugins=true,-Dlibcryptsetup-plugins=false,cryptsetup,,cryptsetup"
 PACKAGECONFIG[tpm2] = "-Dtpm2=true,-Dtpm2=false,tpm2-tss,tpm2-tss libtss2 libtss2-tcti-device"
 # If multiple compression libraries are enabled, the format to use for compression is chosen implicitly,
 # so if you want to compress with e.g. lz4 you cannot enable zstd, so you cannot read zstd-compressed journal files.
-- 
2.42.0

[OE-core][PATCH 4/4] systemd: add p11kit package config

[Jose Quaresma]

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
---
 meta/recipes-core/systemd/systemd_254.4.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb
index 578d3b463d..fc42787555 100644
--- a/meta/recipes-core/systemd/systemd_254.4.bb
+++ b/meta/recipes-core/systemd/systemd_254.4.bb
@@ -186,6 +186,7 @@ PACKAGECONFIG[oomd] = "-Doomd=true,-Doomd=false"
 PACKAGECONFIG[openssl] = "-Dopenssl=true,-Dopenssl=false,openssl"
 PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam,${PAM_PLUGINS}"
 PACKAGECONFIG[pcre2] = "-Dpcre2=true,-Dpcre2=false,libpcre2"
+PACKAGECONFIG[p11kit] = "-Dp11kit=true,-Dp11kit=false,p11-kit"
 PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false"
 # If polkit is disabled and networkd+hostnamed are in use, enabling this option and
 # using dbus-broker will allow networkd to be authorized to change the
-- 
2.42.0

Re: [OE-core][PATCH 2/4] systemd: add systemd-crypt package

[Erik Schilling]

On Tue Oct 17, 2023 at 11:18 AM CEST, Jose Quaresma wrote:
> Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> ---
>  meta/recipes-core/systemd/systemd_254.4.bb | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb
> index d24bf0cb06..2146c130d5 100644
> --- a/meta/recipes-core/systemd/systemd_254.4.bb
> +++ b/meta/recipes-core/systemd/systemd_254.4.bb
> @@ -387,6 +387,7 @@ PACKAGE_BEFORE_PN = "\
>      ${PN}-analyze \
>      ${PN}-binfmt \
>      ${PN}-container \
> +    ${PN}-crypt \
>      ${PN}-extra-utils \
>      ${PN}-gui \
>      ${PN}-initramfs \
> @@ -446,6 +447,11 @@ USERADD_PARAM:${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin sys
>  
>  FILES:${PN}-analyze = "${bindir}/systemd-analyze"
>  
> +FILES:${PN}-crypt = "${bindir}/systemd-cryptenroll \
> +                     ${nonarch_libdir}/cryptsetup \

Won't there be .so plugin files in this folder that are arch-specific?
I assumed ${nonarch_libdir} should only be used for non-architecture
specific files?

- Erik

> +                    "
> +RRECOMMENDS:${PN} += "${PN}-crypt"
> +
>  FILES:${PN}-initramfs = "/init"
>  RDEPENDS:${PN}-initramfs = "${PN}"
>  
> @@ -552,7 +558,6 @@ FILES:${PN}-extra-utils = "\
>                          ${bindir}/systemd-run \
>                          ${bindir}/systemd-cat \
>                          ${bindir}/systemd-creds \
> -                        ${bindir}/systemd-cryptenroll \
>                          ${bindir}/systemd-delta \
>                          ${bindir}/systemd-cgls \
>                          ${bindir}/systemd-cgtop \

Re: [OE-core][PATCH 2/4] systemd: add systemd-crypt package

[Erik Schilling]

On Tue Oct 17, 2023 at 11:18 AM CEST, Jose Quaresma wrote:
> Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> ---
>  meta/recipes-core/systemd/systemd_254.4.bb | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Looks reasonable to me. I can test it, but it will probably take me a
few days until I get to this.

- Erik

>
> diff --git a/meta/recipes-core/systemd/systemd_254.4.bb b/meta/recipes-core/systemd/systemd_254.4.bb
> index d24bf0cb06..2146c130d5 100644
> --- a/meta/recipes-core/systemd/systemd_254.4.bb
> +++ b/meta/recipes-core/systemd/systemd_254.4.bb
> @@ -387,6 +387,7 @@ PACKAGE_BEFORE_PN = "\
>      ${PN}-analyze \
>      ${PN}-binfmt \
>      ${PN}-container \
> +    ${PN}-crypt \
>      ${PN}-extra-utils \
>      ${PN}-gui \
>      ${PN}-initramfs \
> @@ -446,6 +447,11 @@ USERADD_PARAM:${PN}-journal-upload = "--system -d / -M --shell /sbin/nologin sys
>  
>  FILES:${PN}-analyze = "${bindir}/systemd-analyze"
>  
> +FILES:${PN}-crypt = "${bindir}/systemd-cryptenroll \
> +                     ${nonarch_libdir}/cryptsetup \
> +                    "
> +RRECOMMENDS:${PN} += "${PN}-crypt"
> +
>  FILES:${PN}-initramfs = "/init"
>  RDEPENDS:${PN}-initramfs = "${PN}"
>  
> @@ -552,7 +558,6 @@ FILES:${PN}-extra-utils = "\
>                          ${bindir}/systemd-run \
>                          ${bindir}/systemd-cat \
>                          ${bindir}/systemd-creds \
> -                        ${bindir}/systemd-cryptenroll \
>                          ${bindir}/systemd-delta \
>                          ${bindir}/systemd-cgls \
>                          ${bindir}/systemd-cgtop \

Re: [OE-core][PATCH 2/4] systemd: add systemd-crypt package

[Jose Quaresma]

[-- Attachment #1: Type: text/plain, Size: 2142 bytes --]

Erik Schilling <erik.schilling@linaro.org> escreveu no dia quarta,
18/10/2023 à(s) 11:36:

> On Tue Oct 17, 2023 at 11:18 AM CEST, Jose Quaresma wrote:
> > Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
> > ---
> >  meta/recipes-core/systemd/systemd_254.4.bb | 7 ++++++-
> >  1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-core/systemd/systemd_254.4.bb
> b/meta/recipes-core/systemd/systemd_254.4.bb
> > index d24bf0cb06..2146c130d5 100644
> > --- a/meta/recipes-core/systemd/systemd_254.4.bb
> > +++ b/meta/recipes-core/systemd/systemd_254.4.bb
> > @@ -387,6 +387,7 @@ PACKAGE_BEFORE_PN = "\
> >      ${PN}-analyze \
> >      ${PN}-binfmt \
> >      ${PN}-container \
> > +    ${PN}-crypt \
> >      ${PN}-extra-utils \
> >      ${PN}-gui \
> >      ${PN}-initramfs \
> > @@ -446,6 +447,11 @@ USERADD_PARAM:${PN}-journal-upload = "--system -d /
> -M --shell /sbin/nologin sys
> >
> >  FILES:${PN}-analyze = "${bindir}/systemd-analyze"
> >
> > +FILES:${PN}-crypt = "${bindir}/systemd-cryptenroll \
> > +                     ${nonarch_libdir}/cryptsetup \
>
> Won't there be .so plugin files in this folder that are arch-specific?
> I assumed ${nonarch_libdir} should only be used for non-architecture
> specific files?
>

yeah you are right, the plugins are arch specific and nonarch_libdir will
break multilib.
I will change it to just ${libdir} and send a v2.
Thanks for your time.


>
> - Erik
>
> > +                    "
> > +RRECOMMENDS:${PN} += "${PN}-crypt"
> > +
> >  FILES:${PN}-initramfs = "/init"
> >  RDEPENDS:${PN}-initramfs = "${PN}"
> >
> > @@ -552,7 +558,6 @@ FILES:${PN}-extra-utils = "\
> >                          ${bindir}/systemd-run \
> >                          ${bindir}/systemd-cat \
> >                          ${bindir}/systemd-creds \
> > -                        ${bindir}/systemd-cryptenroll \
> >                          ${bindir}/systemd-delta \
> >                          ${bindir}/systemd-cgls \
> >                          ${bindir}/systemd-cgtop \
>
>

-- 
Best regards,

José Quaresma

[-- Attachment #2: Type: text/html, Size: 3612 bytes --]