From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH v2 01/11] grub: Remove obsolete efi_uga module for new distros
Date: Mon, 29 Jun 2026 12:46:14 +0300 [thread overview]
Message-ID: <20260629094624.855927-2-amikan@ilbers.de> (raw)
In-Reply-To: <20260629094624.855927-1-amikan@ilbers.de>
It was deprecated and then completely removed starting from Debian
Forky and Ubuntu Resolute.
Module efi_gop.mod can be used instead.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
.../wic/plugins/source/bootimg-efi-isar.py | 17 ++++++++++++--
.../plugins/source/isoimage-isohybrid-isar.py | 23 +++++++++++++++++--
2 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
index 6bc78d42..a2592986 100644
--- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
+++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
@@ -450,11 +450,22 @@ class BootimgEFIPlugin(SourcePlugin):
if not distro:
raise WicError("Couldn't find target distro")
+ # Module efi_uga is deprecated
+ efi_uga_list = [
+ "buster",
+ "bullseye",
+ "bookworm",
+ "trixie",
+ "focal",
+ "jammy",
+ "noble",
+ ]
+
if distro_arch == "amd64":
grub_target = 'x86_64-efi'
grub_image = "bootx64.efi"
grub_modules = "multiboot iorw ata "
- if "sid" not in distro:
+ if any(name in distro for name in efi_uga_list):
grub_modules += "efi_uga "
if distro.startswith("ubuntu") and \
os.path.exists('/usr/lib/grub/x86_64-efi/linuxefi.mod'):
@@ -462,7 +473,9 @@ class BootimgEFIPlugin(SourcePlugin):
elif distro_arch == "i386":
grub_target = 'i386-efi'
grub_image = "bootia32.efi"
- grub_modules = "multiboot efi_uga iorw ata "
+ grub_modules = "multiboot iorw ata "
+ if any(name in distro for name in efi_uga_list):
+ grub_modules += "efi_uga "
elif distro_arch == "arm64":
grub_target = 'arm64-efi'
grub_image = "bootaa64.efi"
diff --git a/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py b/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py
index 0ed61fff..6aa58870 100644
--- a/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py
+++ b/meta/scripts/lib/wic/plugins/source/isoimage-isohybrid-isar.py
@@ -370,11 +370,28 @@ class IsoImagePlugin(SourcePlugin):
if not target_arch:
raise WicError("Coludn't find target architecture")
+ distro = get_bitbake_var("DISTRO")
+ if not distro:
+ raise WicError("Couldn't find target distro")
+
+ # Module efi_uga is deprecated
+ efi_uga_list = [
+ "buster",
+ "bullseye",
+ "bookworm",
+ "trixie",
+ "focal",
+ "jammy",
+ "noble",
+ ]
+
if re.match("x86_64", target_arch):
grub_target = "x86_64-efi"
grub_src_image = "grub-efi-bootx64.efi"
grub_dest_image = "bootx64.efi"
- grub_modules = "multiboot efi_uga iorw ata "
+ grub_modules = "multiboot iorw ata "
+ if any(name in distro for name in efi_uga_list):
+ grub_modules += "efi_uga "
if get_bitbake_var("DISTRO").startswith("ubuntu") and \
os.path.exists('/usr/lib/grub/x86_64-efi/linuxefi.mod'):
grub_modules += "linuxefi "
@@ -382,7 +399,9 @@ class IsoImagePlugin(SourcePlugin):
grub_target = "i386-efi"
grub_src_image = "grub-efi-bootia32.efi"
grub_dest_image = "bootia32.efi"
- grub_modules = "multiboot efi_uga iorw ata "
+ grub_modules = "multiboot iorw ata "
+ if any(name in distro for name in efi_uga_list):
+ grub_modules += "efi_uga "
else:
raise WicError("grub-efi is incompatible with target %s" %
target_arch)
--
2.34.1
--
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20260629094624.855927-2-amikan%40ilbers.de.
next prev parent reply other threads:[~2026-06-29 9:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-29 9:46 [PATCH v2 00/11] Add new targets and required fixes Anton Mikanovich
2026-06-29 9:46 ` Anton Mikanovich [this message]
2026-06-29 9:46 ` [PATCH v2 02/11] CI: Freeze setuptools package version for avocado compatibility Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 03/11] CI: Fix errors reporting during startvm Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 04/11] meta: Add base distro overrides Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 05/11] linux-kernel: Reverse linux-libc-dev package arch selection logic Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 06/11] trixie: Split missing drivers hook recipes Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 07/11] CI: Move trixie targets to generic test cases Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 08/11] CI: Run startvm for all qemu targets Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 09/11] meta: Add Ubuntu 26.04 (Resolute Raccoon) support Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 10/11] testsuite: Cover Debian Trixie RISCV64 QEMU target with CI Anton Mikanovich
2026-06-29 9:46 ` [PATCH v2 11/11] testsuite: Cover Debian Forky " Anton Mikanovich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260629094624.855927-2-amikan@ilbers.de \
--to=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox