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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5333138334 for ; Tue, 3 Jul 2018 20:35:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A2382E0A94; Tue, 3 Jul 2018 20:35:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5F3BCE0A94 for ; Tue, 3 Jul 2018 20:35:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 273C0335CA5 for ; Tue, 3 Jul 2018 20:35:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C89F2B3 for ; Tue, 3 Jul 2018 20:35:06 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1530650005.f21f16418c91c5b5601aa6c7927f47c57f8d2d66.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: f21f16418c91c5b5601aa6c7927f47c57f8d2d66 X-VCS-Branch: master Date: Tue, 3 Jul 2018 20:35:06 +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-Archives-Salt: f3ae8883-cb30-4d2d-9794-070af7d77a9a X-Archives-Hash: 38c9f73134bc70f3527f7143dfd96fe8 commit: f21f16418c91c5b5601aa6c7927f47c57f8d2d66 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Tue Jul 3 20:33:25 2018 +0000 Commit: Richard Farina gentoo org> CommitDate: Tue Jul 3 20:33:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f21f1641 always support both uefi modes targets/support/functions.sh | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/targets/support/functions.sh b/targets/support/functions.sh index e8f3e401..d4834a2d 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -107,23 +107,24 @@ create_bootloader() { echo "configfile /grub/grub.cfg" >> grub-stub.cfg cp /usr/share/grub/unicode.pf2 grub/fonts/ - if [ "${clst_buildarch}" = "x86" ] || [ "${clst_buildarch}" = "amd64" ]; then - # some 64 bit machines have 32 bit UEFI, so we take the safest path - mkdir -p grub/i386-efi - cp /usr/lib/grub/i386-efi/*.lst /usr/lib/grub/i386-efi/*.img /usr/lib/grub/i386-efi/*.mod grub/i386-efi/ - ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= -v || die "Failed to make grubia32.efi" - #secure boot shim - cp /usr/share/shim/BOOTIA32.EFI boot/EFI/BOOT/ - cp /usr/share/shim/mmia32.efi boot/EFI/BOOT/ - fi - if [ "${clst_buildarch}" = "amd64" ]; then - mkdir -p grub/x86_64-efi - cp /usr/lib/grub/x86_64-efi/*.lst /usr/lib/grub/x86_64-efi/*.img /usr/lib/grub/x86_64-efi/*.mod grub/x86_64-efi/ - ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O x86_64-efi -o ./boot/EFI/BOOT/grubx64.efi --themes= -v || die "Failed to make grubx64.efi" - #secure boot shim - cp /usr/share/shim/BOOTX64.EFI boot/EFI/BOOT/ - cp /usr/share/shim/mmx64.efi boot/EFI/BOOT/ - fi + + # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both + # set up 32 bit uefi + mkdir -p grub/i386-efi + cp /usr/lib/grub/i386-efi/*.lst /usr/lib/grub/i386-efi/*.img /usr/lib/grub/i386-efi/*.mod grub/i386-efi/ + ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= -v || die "Failed to make grubia32.efi" + #secure boot shim + cp /usr/share/shim/BOOTIA32.EFI boot/EFI/BOOT/ + cp /usr/share/shim/mmia32.efi boot/EFI/BOOT/ + + #set up 64 bit uefi + mkdir -p grub/x86_64-efi + cp /usr/lib/grub/x86_64-efi/*.lst /usr/lib/grub/x86_64-efi/*.img /usr/lib/grub/x86_64-efi/*.mod grub/x86_64-efi/ + ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O x86_64-efi -o ./boot/EFI/BOOT/grubx64.efi --themes= -v || die "Failed to make grubx64.efi" + #secure boot shim + cp /usr/share/shim/BOOTX64.EFI boot/EFI/BOOT/ + cp /usr/share/shim/mmx64.efi boot/EFI/BOOT/ + rm grub-stub.cfg || echo "Failed to remove grub-stub.cfg, but this hurts nothing" popd || die "Failed to leave livecd dir" }