isar-installer: Select bootloader package based on distro

Message ID 20241111160938.1274270-1-amikan@ilbers.de
State Accepted, archived
Headers show
Series isar-installer: Select bootloader package based on distro | expand

Commit Message

Anton Mikanovich Nov. 11, 2024, 4:09 p.m. UTC
Building of isar-installer with Ubuntu Jammy fails on:

| E: Unable to locate package systemd-boot

Use distro-related variable for bootloader package dependency to fix
this issue.

Fixes issue #108

Reported-by: Zong Xin <zongxin19930430@163.com>
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta-isar/recipes-core/images/isar-image-installer.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Uladzimir Bely Nov. 20, 2024, 5:39 a.m. UTC | #1
On Mon, 2024-11-11 at 18:09 +0200, Anton Mikanovich wrote:
> Building of isar-installer with Ubuntu Jammy fails on:
> 
> > E: Unable to locate package systemd-boot
> 
> Use distro-related variable for bootloader package dependency to fix
> this issue.
> 
> Fixes issue #108
> 
> Reported-by: Zong Xin <zongxin19930430@163.com>
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta-isar/recipes-core/images/isar-image-installer.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-isar/recipes-core/images/isar-image-installer.bb
> b/meta-isar/recipes-core/images/isar-image-installer.bb
> index e16716d5..dfce311a 100644
> --- a/meta-isar/recipes-core/images/isar-image-installer.bb
> +++ b/meta-isar/recipes-core/images/isar-image-installer.bb
> @@ -10,7 +10,7 @@ DESCRIPTION = "Example of a ISAR based Installer
> Image"
>  # Use variable to switch easily to another wks
>  INSTALLER_WKS_FILE ??= "installer-efi.wks.in"
>  WKS_FILE = "${INSTALLER_WKS_FILE}"
> -IMAGER_INSTALL:wic:append = " systemd-boot"
> +IMAGER_INSTALL:wic:append = " ${SYSTEMD_BOOTLOADER_INSTALL}"
>  
>  IMAGE_INSTALL += "deploy-image-service"
>  
> -- 
> 2.34.1
> 

Applied to next.

Patch

diff --git a/meta-isar/recipes-core/images/isar-image-installer.bb b/meta-isar/recipes-core/images/isar-image-installer.bb
index e16716d5..dfce311a 100644
--- a/meta-isar/recipes-core/images/isar-image-installer.bb
+++ b/meta-isar/recipes-core/images/isar-image-installer.bb
@@ -10,7 +10,7 @@  DESCRIPTION = "Example of a ISAR based Installer Image"
 # Use variable to switch easily to another wks
 INSTALLER_WKS_FILE ??= "installer-efi.wks.in"
 WKS_FILE = "${INSTALLER_WKS_FILE}"
-IMAGER_INSTALL:wic:append = " systemd-boot"
+IMAGER_INSTALL:wic:append = " ${SYSTEMD_BOOTLOADER_INSTALL}"
 
 IMAGE_INSTALL += "deploy-image-service"