From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 97B581580FD for ; Mon, 23 Dec 2024 21:26:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5A89E05AC; Mon, 23 Dec 2024 21:26:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 691C0E05AC for ; Mon, 23 Dec 2024 21:26:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2339833BE18 for ; Mon, 23 Dec 2024 21:26:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7019B1048 for ; Mon, 23 Dec 2024 21:26:10 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1734989155.1151a6ae1a11a3fc1288598b50a70d231a5cda4c.dilfridge@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/qcow2-grub-install.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 1151a6ae1a11a3fc1288598b50a70d231a5cda4c X-VCS-Branch: master Date: Mon, 23 Dec 2024 21:26:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8eb6256-8097-4e5c-b637-92c7b4e38999 X-Archives-Hash: 6e6544f94c8113abe85b93dae56ddc8f commit: 1151a6ae1a11a3fc1288598b50a70d231a5cda4c Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Dec 23 21:25:14 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Dec 23 21:25:55 2024 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1151a6ae Allow qcow2 grub-install on arm64 Signed-off-by: Andreas K. Hüttel gentoo.org> targets/support/qcow2-grub-install.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/targets/support/qcow2-grub-install.sh b/targets/support/qcow2-grub-install.sh index 850eb72a..7caa9e11 100755 --- a/targets/support/qcow2-grub-install.sh +++ b/targets/support/qcow2-grub-install.sh @@ -2,8 +2,16 @@ source /tmp/chroot-functions.sh -echo "Installing grub with target x86_64-efi" -grub-install --no-floppy --efi-directory=/boot --removable --skip-fs-probe --no-nvram --no-bootsector --target=x86_64-efi +case ${clst_hostarch} in + amd64) + echo "Installing grub with target x86_64-efi" + grub-install --no-floppy --efi-directory=/boot --removable --skip-fs-probe --no-nvram --no-bootsector --target=x86_64-efi + ;; + arm64) + echo "Installing grub with target arm64-efi" + grub-install --no-floppy --efi-directory=/boot --removable --skip-fs-probe --no-nvram --no-bootsector --target=arm64-efi + ;; +esac echo "Creating grub configuration" grub-mkconfig -o /boot/grub/grub.cfg