From patchwork Tue Feb 24 12:01:11 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 4905 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 24 Feb 2026 13:01:32 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 61OC1W3O029122 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Feb 2026 13:01:32 +0100 Received: by mail-wm1-f63.google.com with SMTP id 5b1f17b1804b1-4837a718f41sf27842835e9.2 for ; Tue, 24 Feb 2026 04:01:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1771934487; cv=pass; d=google.com; s=arc-20240605; b=VYu1LW8EWcDdZajy6dZyLHptYMsc1xoMT/g/8qHJn8CKTxRsdKtallTj0bAhMut6WE eoStdzRdpVLtywsEzDVxhGMxqekTlHg0OSxHnRMcnzbaW5aiAlkEusSIKP8dbKoEc0X2 ji976CAvyNwa3dMHfKWeceGo0Ju2Q7WJ9QPEPa/QyUT/eWvXPqb8gHd4c/VWG3OVapUv weOsEIPu/OWdTfrcz5r5oGLYPlO1XzSU2G7+H4coN8DdR9JonMEZuUfQHObfFhzJ9hZg gk1gpFuq10l8L1P0WJtc7DEHPu9DPeEgA7tqfpnQbG35/u5eYzBOLIpRKQyUOPmnNSAv hiTQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:sender:dkim-signature; bh=YGC4KRY/7n7elpdfqdpNeV/TTnQGOr7hPnRXqeuW5fI=; fh=PLv89bwKlFxfQkkxPvoUpoLdWeBj+BsvdFaw2BWrsXs=; b=d3l5r50LL5jwKu5/2J6Kpv3aTAPDzoG7pztEE+JFU964obUlrwe9w6h4oaWahEOhPI F+gEvEh1Er2TBuQmH8HRQVfyTzCsAJsDzAwF8nVGyS8DDGZDXEfh+iJGJh/DsPTrZ+yg 3eWtxS71sOSCBC7fziGq/v5qhoIRRS4gfQPdeQiYXCP0YYgQmYaAOZz/v7rbPEd7ovLA sciHB722VA0sLfQKRSirc8tPRZUZXSxpKVfMwXCKi5hBXdge1GUf7TA6jGKGaSsC973C DjyOFQCrgk9bbdh481p+4syVGWWDr8ExYS32CU02R5bgVZTR11qChsUgghxRa0WL+1EA ihZw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1771934486; x=1772539286; 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:content-transfer-encoding:mime-version:message-id :date:subject:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=YGC4KRY/7n7elpdfqdpNeV/TTnQGOr7hPnRXqeuW5fI=; b=f2UMHeeiYXeTlMEcNRmxos1AyxLv7EBn0EjsOgWpMRRIN78Krjk9FXTs3+DBFdz2KX a8enejI6uNyaVD6nBYkq07xD1j9wvZN/vnZPFoQ/7bkmBhNrl6XJDK9c1Ih64+MYjC+k X64bh/TcXXfjByeybsS3b0zfq6SNCOFDfhV89mJllf2ozM01SnMd1k7XfcbdmXhcBd1r VSB9Y6zchHO9OF44ib+GHdE7wbAibYuoHKOwlnNAqPfkN2N9GMIEaYBr6oVGV3k2RAtg OnedgKg326CJ91p4HMa63Be2uiSA++1pF0EEG8SgYTMx51ebUO9lP8mnzqzUCGqbhSk6 7V/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771934487; x=1772539287; 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 :content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=YGC4KRY/7n7elpdfqdpNeV/TTnQGOr7hPnRXqeuW5fI=; b=nfjqtGgkU3+KjkjEJYhG3rqTDctFcirbLBfDoHEHwcDYUxHXwt/SWSWxQl9mI+I7YA EZT6kgX044ZwgA2Qno/SrOOt9+F5kngwEcfYbscn9qgeTfOS+HgDsQVaDcpz5zRhQr+u HWJtqccpdTEyhZFjqEWY+MCWhvJGzsxxbmWzcHCxl9Dka3QGVqlthpBoClqDeflqcHjx jv6Fc1K+i4iOP/MbiUa5hIDl4V3/0+dnMdqeC6eTK6OxJH2ed2eq3EWzs2Cpn3eXEe8M q3HYnclyra4GbSCH/DAchj6oL1bRdgtVoBP4z+aGTrBZaaJOEqJZgLdWyHEFytzReG4D tDZg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCV6Mg/eJ7xYh3DN9FJjjZa+LKviIIqOm48cLh1PVb0QKjF3wKMOg5SD4B7MtS0N9a37QIK5EUo=@isar-build.org X-Gm-Message-State: AOJu0YySnscz44A+nB2xdGPDv01ueYzjOltlwsoSLRzf6EnaNC7aTzRK iL7F9xuQDl1mMtNiLLzOVQpMhD1QRrjkcHN/wTNDecH+ib7Z/FgYzdnw X-Received: by 2002:a05:600c:8b2a:b0:47e:e78a:c834 with SMTP id 5b1f17b1804b1-483a96148a7mr179209855e9.34.1771934486446; Tue, 24 Feb 2026 04:01:26 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+EbqMdKsUAQAYlx3Ld1KaUka2egpwlR09Z4MKyy9onI4Q==" Received: by 2002:a05:600c:1d0e:b0:477:5a45:da9e with SMTP id 5b1f17b1804b1-483670213a0ls83576155e9.0.-pod-prod-04-eu; Tue, 24 Feb 2026 04:01:23 -0800 (PST) X-Received: by 2002:a05:600c:8107:b0:483:103c:b1ee with SMTP id 5b1f17b1804b1-483a95c536dmr171836535e9.8.1771934483744; Tue, 24 Feb 2026 04:01:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1771934483; cv=none; d=google.com; s=arc-20240605; b=P18Y46kSQ6uKTbELL40I5xNDPN9vwMSNFsSFxjt7YHBWHxmtd9hWw65kkprfuvRJ3I J+Xn7UyCs13HUicfeoUaTomeRDKTatnty9sX2H90xAbOP5xCuc1EVRvOC/YKjt1b3wgu EeFi8CU3ZPjBfcRN9c2oIHxzWMxIePq1eIy8fushSvCqTNY6kXSk3cRHIpoPYjzHdTzj sP4wP1UuJxf4VMjYGXy0B921I/IX6qDi2cA8gx3bK8ejJFPc4CmHx0g3NBxMccpKl/NO bKrs4C8I/+2PlouX5mk+eIlTZzZHlIs4zfKgqcKgTjGa8Cjo3fUZBLmUVeytvhIdRCRv jf3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=SNqYcKhWpYkSpZym+aN84/ZR3iWw+62SLBi7nL2GrwM=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=gSJ/NYxWT1OaPaLjmv7y1QrcsvMVC09DGrjWGbM6mp6MlUCkx1RImBzlEGbg8AKVBN P5AFm8Dhw1Z64fUf1+lx4KAEf3JIwsKZveZ7jNVszd14tgvVxi1vMYLsAmJxsANOYRCR 3lX1DPYj45ofNRLnuZRdpudxlNAC796IkBk7/8wxhh6GYMNR8aTEviFi2BzwaGPXt+SJ 6V8eLWqY4GeEhnuOJVmTzG1rDfG3rF9CZ5GGGVLx0+H37vhpm3i5e7b5oOUbG9i5y9EY VYLncXEGoVBDsajAEf6OmluKclHQEY+gkxUW401lrJNnV9Q1vTeDKDG101PDkrdo9gl4 D/Sw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-483a31a6b30si1436305e9.2.2026.02.24.04.01.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Feb 2026 04:01:23 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.promwad.com (mm-44-208-124-178.static.mgts.by [178.124.208.44]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 61OC1MQM029108 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 24 Feb 2026 13:01:23 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] Fix building qemuamd64-sid Date: Tue, 24 Feb 2026 15:01:11 +0300 Message-ID: <20260224120117.1135921-1-ubely@ilbers.de> X-Mailer: git-send-email 2.52.0 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: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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?= In sid, package grub-efi-amd64-bin deprecates "efi_uga.mod" so exclude it for sid to fix wic image creation. Fixes: ERROR: _exec_cmd: grub-mkimage -p /EFI/BOOT -O x86_64-efi -o /tmp/isar-image-base-debian-sid-qemuamd64.wic/tmp.wic.47tg4qtv/hdd/boot/EFI/BOOT/bootx64.efi part_gpt part_msdos ntfs ntfscomp fat ext2 normal chain boot configfile linux search efi_gop font gfxterm gfxmenu terminal minicmd test loadenv echo help reboot serial terminfo iso9660 loopback tar memdisk ls search_fs_uuid udf btrfs xfs lvm reiserfs regexp multiboot efi_uga iorw ata returned '1' instead of 0 output: grub-mkimage: error: cannot open `/usr/lib/grub/x86_64-efi/efi_uga.mod': No such file or directory. --- .../scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 ed3bed88..6bc78d42 100644 --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -446,11 +446,17 @@ class BootimgEFIPlugin(SourcePlugin): if not distro_arch: raise WicError("Couldn't find target architecture") + distro = get_bitbake_var("DISTRO") + if not distro: + raise WicError("Couldn't find target distro") + if distro_arch == "amd64": grub_target = 'x86_64-efi' grub_image = "bootx64.efi" - grub_modules = "multiboot efi_uga iorw ata " - if get_bitbake_var("DISTRO").startswith("ubuntu") and \ + grub_modules = "multiboot iorw ata " + if "sid" not in distro: + grub_modules += "efi_uga " + if distro.startswith("ubuntu") and \ os.path.exists('/usr/lib/grub/x86_64-efi/linuxefi.mod'): grub_modules += "linuxefi " elif distro_arch == "i386":