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

[PATCH v2 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.

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

[PATCH v2 1/2] meta: introduce systemd-boot dependency variable

[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 <amikan@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

[PATCH v2 2/2] meta-isar: enable systemd-boot for qemuarm-bookworm

[Anton Mikanovich]

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

Signed-off-by: Anton Mikanovich <amikan@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

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

[Anton Mikanovich]

12.07.2022 16:22, Anton Mikanovich wrote:
> 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(+)
>
Applied to next.