| Message ID | 20240405092335.13096-1-ubely@ilbers.de |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | meta-test: Fix building focal/jammy qemuamd64 isar-image-ci | expand |
On Fri, 2024-04-05 at 12:23 +0300, Uladzimir Bely wrote: > After commit "fix: package exceptions for distro versions" systemd > bootloader changed default value from "systemd" to "systemd-boot- > efi". > > This requires appropriate changes for ":focal" and ":jammy" to make > isar-image-ci local redefinitions work again. > > This change is to be applied on top of the patch mentioned above. > > Signed-off-by: Uladzimir Bely <ubely@ilbers.de> > --- > meta-isar/conf/distro/ubuntu-common.inc | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta- > isar/conf/distro/ubuntu-common.inc > index 9d8a843b..70893481 100644 > --- a/meta-isar/conf/distro/ubuntu-common.inc > +++ b/meta-isar/conf/distro/ubuntu-common.inc > @@ -32,3 +32,6 @@ IMAGE_PREINSTALL += "init" > IMAGE_PREINSTALL += "initramfs-tools" > > IMAGER_INSTALL:wic += "python3-distutils" > + > +SYSTEMD_BOOTLOADER_INSTALL:focal = "systemd:${DISTRO_ARCH}" > +SYSTEMD_BOOTLOADER_INSTALL:jammy = "systemd:${DISTRO_ARCH}" > -- > 2.43.2 > Applied to next.
diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 9d8a843b..70893481 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -32,3 +32,6 @@ IMAGE_PREINSTALL += "init" IMAGE_PREINSTALL += "initramfs-tools" IMAGER_INSTALL:wic += "python3-distutils" + +SYSTEMD_BOOTLOADER_INSTALL:focal = "systemd:${DISTRO_ARCH}" +SYSTEMD_BOOTLOADER_INSTALL:jammy = "systemd:${DISTRO_ARCH}"
After commit "fix: package exceptions for distro versions" systemd bootloader changed default value from "systemd" to "systemd-boot-efi". This requires appropriate changes for ":focal" and ":jammy" to make isar-image-ci local redefinitions work again. This change is to be applied on top of the patch mentioned above. Signed-off-by: Uladzimir Bely <ubely@ilbers.de> --- meta-isar/conf/distro/ubuntu-common.inc | 3 +++ 1 file changed, 3 insertions(+)