From patchwork Mon Jun 29 09:46:14 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 5194 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 29 Jun 2026 11:46:43 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 65T9kgme023613 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 29 Jun 2026 11:46:42 +0200 Received: by mail-wm1-f56.google.com with SMTP id 5b1f17b1804b1-490a060eb84sf23079185e9.0 for ; Mon, 29 Jun 2026 02:46:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1782726397; cv=pass; d=google.com; s=arc-20260327; b=r0wBOylatKlCM10HFaob1GcBOvEjGziT3qMGm1o2AXlFnbK0w/MFk3rLl/goOrggug 2T4IgaPEBKe0he0hJwuFiBB0KAfze2aKGdzL2wYOu3NpIbTITjbaQyJkWkLtkfWOhn4y 2bkD4YSG4fIR4xHR3oBpvsi9zCOswgJykpIYDETQB6NepowNLDnbAk3iZRElna9w7uKi psxIokmXIrGs1R4n5iXiptBcooplEH/zq+9YXFCvAhUNiXX/xoJlvY3LiJmiXtNUmxKc s31TbaI+iRf7D9sd5aqYgKgurfunNwhha0vKSPFxbY7UGxNrRe5Op1dN79opdhTUJfoN IHNw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=bMjR24/J9tfgE7EE7aNec7/VkWVf2xqyk7x45ofqGOw=; fh=zQYTA9KGtpNgj1jwjY3iZdRnPXEZg7x5Fz322EvKY+U=; b=rL8hcF9/VKR4qgYkpXt26L4U+j7Pl3OUBTwUIHVIkPhFkfJokGTrVZ5VA7MY2QUj7N LqaXcwun57uh9rPGHxajBS4V7MGmhVIKqCLWhl5VA5phlPKD54MpUYh3NhHMwt7v+DjH L/EaLbDkHHZytfNp4T48CInwz6ZuoKFJZ2v8ktxxcBUBn1Uix2DQcvaCuIpy/qa1f+3m fkxXOxacD1jnskE2xSVMfmEGsELiMjGWtnsltoY0b2ItlpSZFuC5zML1plQeai+yOjzF I+bVmEXPFgch5GaATOQ7svNu0iWRdjG8eugfBHzhNg4W8XSgoHdn1oTkm99UxYctZXUu r5tA==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20251104; t=1782726397; x=1783331197; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=bMjR24/J9tfgE7EE7aNec7/VkWVf2xqyk7x45ofqGOw=; b=baGtplAsApGsPvOGNhRKVEZmPRHbqH6T/aCiZrCSMZX084tCpSEKSQbldAtbZ/L9Lu ZuSS0sAsKXubecLnXeFeizQK3XSGoJaGq2JMp2NwzcZzzO5N6/dLgxG9g4QQVPZnaarD r5NX+m9NF09pwiqFoDIj6cSx4HkkurQhK/M/Gi0zu9b6pqw19LgK1+u36nmsGh/zenpn dhJ4BUOfY+AyyHcgI/WrUtoDcICu7NCLakWvAtk/qenWLThUkA2AuQG8zfEWqNMDVkXB cVxy3OcXk76iBaWHX4n9AHmyJ7t8n9BN7TTr+TSmqFyZq2IJXjBfC15ar666nhCVdn7L 1rLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782726397; x=1783331197; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=bMjR24/J9tfgE7EE7aNec7/VkWVf2xqyk7x45ofqGOw=; b=iH8Xs3FfVdUXSMXCCbbxOAF0WTNapCG9qVqNLMKGdS6NNhBd07ODHHuFkuLwwP0neR bxCaZtBq0Yx2Bub1atNQJatEYcRhr0pEEw0ii4FZNkn7E+iWlodJqHkMMAGbxTL6HZyg AjMNUuF+cJHG56m4LEpaVdPO/8b1NYTyS6mVES2WnlDsBYZPisem46d9wtIVh5s8691f TQUulclXJ8ap9TTXv2vgoFWTZn6Svg8zwx2AsmmFTNbjFoWr3N+WdzxorDcHWj/xzI+a zyzPiM/tsx/upi6VAdFoL5oF3aPvnZe7bi1riiLW673XUjRHB78NUjDKGI5jhBNsCNMj 8xEw== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AFNElJ80BpeUDZdnw+IQToCxzvjJNNcEr1npgnXUvugDM0iDMjX13RKTTI3POLUhWa67SWyAzWxyaxU=@isar-build.org X-Gm-Message-State: AOJu0YxYME3x7+FuGnhDw+b0Os/tc1kv7q8ZQnp5ykDlxHfWq1RaWusv F1O9Vb8/m0yItVNEl0T2ye668FB7LwPm90lqL1HsNb17t4SFK5VZjY+U X-Received: by 2002:a05:600c:c83:b0:490:e196:eaee with SMTP id 5b1f17b1804b1-493b7197579mr501125e9.10.1782726396805; Mon, 29 Jun 2026 02:46:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="AX0PUUcHNqIgUPWVPrrBX5jdTnvgBQma0CNAuhgxG/o0G2KfeQ==" Received: by 2002:a05:600c:3b28:b0:490:3dcb:31d9 with SMTP id 5b1f17b1804b1-49237e3a1cels102296925e9.2.-pod-prod-03-eu; Mon, 29 Jun 2026 02:46:34 -0700 (PDT) X-Received: by 2002:a05:600c:c285:b0:493:a9dc:8634 with SMTP id 5b1f17b1804b1-493b71c067bmr156425e9.23.1782726394656; Mon, 29 Jun 2026 02:46:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1782726394; cv=none; d=google.com; s=arc-20260327; b=DJvUZ/DbyQ4xrQS9QQBQz5Tteas8U1oJxqjFplc2KabnZw3b7sbnhOHQcxqGwfKJdv IJq42D3OyJ9/IVOmE9P7drXfvsUbpgK5Gj02W/s6c+twUkAE17AV1A8BWXZrvqssavuC QBZXx0Ta5WURPAL1AxD7SDzFKbDSFEEvlui3RRXxJLizFPrKgUSuvGH8czaO1FcNxvaL +OQ45MI1DBddJ5IqyUoNQdyKmi0VmYfScP48HD9lu+P1ct0aQJPFdJLCE31klIzPr0ZS HEA2OCfH9HV+7I0VxYuXCEdm6a+wgL68U01jsdHdQ+zWtoDylIY2VGFCUTEXTUmuqHr8 fXDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=ZO2y2DUH2o/mejfKW+W5iieOC/A7cZpiu2hbBDdHZHo=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=rbEJCkcwX7jMQDFDFeYoGWlTOhAahnraw8S+dr7POilX0j0LstNw3UXpe4lbCIr67Y tlyr9deKC5OtLPjGd4iTou/3UlZsrgjE5eokKk6a2cazRdcWjE91dWbDQ3fZcYrjbNfe przjQYVbvK+8y5r7nWFA74Z+aY9xy+MiiSeh4siYJfC5KE6HQra3EfqM/k4xTCuSi0+C lLSGVNq0HiVubeNf6LscRc31pdk3oEdUtJhSRHaoTtzJD+svjjFDH11OA3fYB21Ud68V z/gnKORbqKKSxcZbLtlR4LLlPF1GK/0SnhJNmW7Z6V3nmfpH93EtswS1B3FLoOn7Ktkc HnqQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-4926c020beesi1530725e9.0.2026.06.29.02.46.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 29 Jun 2026 02:46:34 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 65T9kVV5023553 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 29 Jun 2026 11:46:33 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 01/11] grub: Remove obsolete efi_uga module for new distros Date: Mon, 29 Jun 2026 12:46:14 +0300 Message-Id: <20260629094624.855927-2-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260629094624.855927-1-amikan@ilbers.de> References: <20260629094624.855927-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-Original-Sender: amikan@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 --- .../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)