[PATCH 0/2] Fix and cover systemd-boot usage in bookworm

[Anton Mikanovich]

Starting from bookworm systemd-boot was moved into separate package
which was not installed by default.
Add missed dependency variable on systemd-boot for wks files with this
bootloader usage. Also cover it with CI enabling failed configuration
for qemuarm-bookworm target.

Anton Mikanovich (2):
meta: introduce systemd-boot dependency variable
meta-isar: enable systemd-boot for qemuarm-bookworm

meta-isar/conf/multiconfig/qemuarm-bookworm.conf | 5 +++++
meta/conf/distro/debian-common.conf | 2 ++
2 files changed, 7 insertions(+)

--
2.17.1

[Anton Mikanovich]

Add WIC imagetype with wks which use systemd-boot bootloader for
SYSTEMD_BOOTLOADER_INSTALL testing.

Signed-off-by: Anton Mikanovich <ami...@ilbers.de>
---
meta-isar/conf/multiconfig/qemuarm-bookworm.conf | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf
index 0819236..b515e40 100644
--- a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf
+++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf
@@ -2,3 +2,8 @@

MACHINE ?= "qemuarm"
DISTRO ?= "debian-bookworm"
+
+IMAGE_FSTYPES_append = " wic"
+WKS_FILE ?= "sdimage-efi-sd"
+
+IMAGE_PREINSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}"
--
2.17.1

[Henning Schild]

Seems like PATCH 1/2 did not make it, also not in the archive.

Henning

Am Thu, 7 Jul 2022 17:18:01 +0300
schrieb Anton Mikanovich <ami...@ilbers.de>:

[Bezdeka, Florian]

Willing to give it a try... But as Henning already mentioned patch 1
was lost somewhere...

[Anton Mikanovich]

08.07.2022 10:57, Bezdeka, Florian wrote:
> Willing to give it a try... But as Henning already mentioned patch 1
> was lost somewhere...

It looks like Google Groups issue, because there are all 3 mails on
maillist.
Anyway, here are declarations I've used there:

SYSTEMD_BOOTLOADER_INSTALL = "systemd"
SYSTEMD_BOOTLOADER_INSTALL_debian-bookworm = "systemd-boot"

We can't just use 'systemd < 251 | systemd-boot' syntax in direct apt-get
install calls, but maybe the way of installing imager deps can be
rebuild later
to use more flexible dependencies syntax.

[Bezdeka, Florian]

On Fri, 2022-07-08 at 11:07 +0300, Anton Mikanovich wrote:
> 08.07.2022 10:57, Bezdeka, Florian wrote:
> > Willing to give it a try... But as Henning already mentioned patch 1
> > was lost somewhere...
> It looks like Google Groups issue, because there are all 3 mails on
> maillist.

Nope... It did not make it into my inbox and I can't find it in the
archive (google groups) as well. Coverletter and 2/2 made it.

Please resend.

[Bezdeka, Florian]

On Fri, 2022-07-08 at 08:11 +0000, Bezdeka, Florian wrote:
> On Fri, 2022-07-08 at 11:07 +0300, Anton Mikanovich wrote:
> > 08.07.2022 10:57, Bezdeka, Florian wrote:
> > > Willing to give it a try... But as Henning already mentioned patch 1
> > > was lost somewhere...
> > It looks like Google Groups issue, because there are all 3 mails on
> > maillist.
>
> Nope... It did not make it into my inbox and I can't find it in the
> archive (google groups) as well. Coverletter and 2/2 made it.
>
> Please resend.
>
> > Anyway, here are declarations I've used there:
> >
> > SYSTEMD_BOOTLOADER_INSTALL = "systemd"
> > SYSTEMD_BOOTLOADER_INSTALL_debian-bookworm = "systemd-boot"

Hm... I'm quite sure hat we (will) have more affected distributions
like Ubuntu.

[Anton Mikanovich]

08.07.2022 11:23, Bezdeka, Florian wrote:
> Hm... I'm quite sure hat we (will) have more affected distributions
> like Ubuntu.

Nope. Ubuntu do not have systemd-boot package, even kinetic with systemd
251.2
has bootloader inside.

[Henning Schild]

Am Fri, 8 Jul 2022 10:23:40 +0200
schrieb "Bezdeka, Florian (T CED SES-DE)" <florian...@siemens.com>:

> On Fri, 2022-07-08 at 08:11 +0000, Bezdeka, Florian wrote:
> > On Fri, 2022-07-08 at 11:07 +0300, Anton Mikanovich wrote:
> > > 08.07.2022 10:57, Bezdeka, Florian wrote:
> > > > Willing to give it a try... But as Henning already mentioned
> > > > patch 1 was lost somewhere...
> > > It looks like Google Groups issue, because there are all 3 mails
> > > on maillist.
> >
> > Nope... It did not make it into my inbox and I can't find it in the
> > archive (google groups) as well. Coverletter and 2/2 made it.
> >
> > Please resend.
> >
> > > Anyway, here are declarations I've used there:
> > >
> > > SYSTEMD_BOOTLOADER_INSTALL = "systemd"
> > > SYSTEMD_BOOTLOADER_INSTALL_debian-bookworm = "systemd-boot"
>
> Hm... I'm quite sure hat we (will) have more affected distributions
> like Ubuntu.

Yes this is kind of hard to maintain. But will likely do. Not sure we
need to cater for all distros out there, but only for the ones in isar.

Henning

[Henning Schild]

Am Thu, 7 Jul 2022 17:18:03 +0300
schrieb Anton Mikanovich <ami...@ilbers.de>:

Unlike the other bootloaders this one comes from inside the target
rootfs, it is a PREINSTALL for the image, not an IMAGER_INSTALL ...
which kind of is a PREINSTALL for the build chroot.

So i suggest to somehow cover that subtle difference i.e. by naming the
variable SYSTEMD_BOOTLOADER_PREINSTALL

Henning

[Henning Schild]

Am Fri, 8 Jul 2022 11:28:43 +0300
schrieb Anton Mikanovich <ami...@ilbers.de>:

In fact the variable should always be "systemd" and used for all
distros. More modern ones would append or replace it with the
systemd-boot-efi.

Henning

[Baurzhan Ismagulov]

On Thu, Jul 07, 2022 at 05:50:21PM +0200, Henning Schild wrote:
> Seems like PATCH 1/2 did not make it, also not in the archive.

Thanks for the heads up. I've checked and seems we have an issue with Google
Groups. Interestingly, on https://groups.google.com/g/isar-users/c/AM9L31ugDco
I do see patch 1 but not patch 2 -- the opposite of what you see; probably
distributed server issues.

I got both patches over the list yesterday, within about a minute of sending.
I've bounced them to you and Florian. Bouncing to isar-users, I got the
following response from Mail Delivery Subsystem <mailer...@googlemail.com>:

** Message not delivered **

Your message couldn't be delivered to isar-...@googlegroups.com because
the remote server is misconfigured. See technical details below for more
information.

The response was:

Circular loop detected

If you experience further issues, please let me know off-list.

With kind regards,
Baurzhan

[Jan Kiszka]

Why should systemd-boot be any different to other EFI bootloaders? Is
our plugin different from all the others? The normal way is indeed
installing it via IMAGER_INSTALL.

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux

[Anton Mikanovich]

As Henning already mentioned systemd-boot(systemd-boot-efi) files (like
systemd-bootx64.efi) supposed to be installed on target rootfs to be used
during the boot process, while IMAGER_INSTALL will place them on buildchroot
only.

[Anton Mikanovich]

Starting from bookworm systemd-boot was moved into separate package
which was not installed by default.
Add missed dependency variable on systemd-boot for wks files with this
bootloader usage. Also cover it with CI enabling failed configuration
for qemuarm-bookworm target.

Changes sinse v1:
- Correct variable naming.
- Fix also sid-ports.

Anton Mikanovich (2):
meta: introduce systemd-boot dependency variable
meta-isar: enable systemd-boot for qemuarm-bookworm

meta-isar/conf/multiconfig/qemuarm-bookworm.conf | 5 +++++

meta/conf/distro/debian-common.conf | 4 ++++
2 files changed, 9 insertions(+)

--
2.17.1

[Anton Mikanovich]

The package systemd-boot was separated from systemd starting from
Debian Bookworm. This makes targets using this bootloader declare
additional dependency based on distro version. Add variable
SYSTEMD_BOOTLOADER_PREINSTALL to use as IMAGE_PREINSTALL in configs.

Signed-off-by: Anton Mikanovich <ami...@ilbers.de>
---

meta/conf/distro/debian-common.conf | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf
index d24fc2b..9203b34 100644
--- a/meta/conf/distro/debian-common.conf
+++ b/meta/conf/distro/debian-common.conf
@@ -28,5 +28,9 @@ GRUB_BOOTLOADER_INSTALL_arm64 = "grub-efi-arm64-bin"

SYSLINUX_BOOTLOADER_INSTALL = "syslinux syslinux-common"

+SYSTEMD_BOOTLOADER_PREINSTALL = "systemd"
+SYSTEMD_BOOTLOADER_PREINSTALL_debian-bookworm = "systemd-boot"
+SYSTEMD_BOOTLOADER_PREINSTALL_debian-sid-ports = "systemd-boot"
+
COMPAT_DISTRO_ARCH_amd64 = "i386"
COMPAT_DISTRO_ARCH_arm64 = "armhf"
--
2.17.1

[Anton Mikanovich]

Add WIC imagetype with wks which use systemd-boot bootloader for

SYSTEMD_BOOTLOADER_PREINSTALL testing.

Signed-off-by: Anton Mikanovich <ami...@ilbers.de>
---

meta-isar/conf/multiconfig/qemuarm-bookworm.conf | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf

index 0819236..c82abf3 100644

--- a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf
+++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf
@@ -2,3 +2,8 @@

MACHINE ?= "qemuarm"
DISTRO ?= "debian-bookworm"
+
+IMAGE_FSTYPES_append = " wic"
+WKS_FILE ?= "sdimage-efi-sd"
+

+IMAGE_PREINSTALL += "${SYSTEMD_BOOTLOADER_PREINSTALL}"
--
2.17.1

[Anton Mikanovich]

Applied to next.