From: Ivan Nikolaenko <ivan.nikolaenko@unikie.com>
To: devel@spectrum-os.org
Cc: Ivan Nikolaenko <ivan.nikolaenko@unikie.com>
Subject: [PATCH v2] EFI Loader: use correct arch suffix
Date: Thu, 29 Sep 2022 13:32:34 +0300 [thread overview]
Message-ID: <20220929103234.2460828-1-ivan.nikolaenko@unikie.com> (raw)
Previously there were hardcoded "x64" in EFI loaders' filenames.
Signed-off-by: Ivan Nikolaenko <ivan.nikolaenko@unikie.com>
---
img/combined/default.nix | 8 +++++---
img/live/Makefile | 2 +-
img/live/default.nix | 6 ++++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/img/combined/default.nix b/img/combined/default.nix
index 3989d55..f65f619 100644
--- a/img/combined/default.nix
+++ b/img/combined/default.nix
@@ -6,7 +6,7 @@
let
inherit (builtins) storeDir;
- inherit (pkgs.lib) removePrefix;
+ inherit (pkgs.lib) removePrefix toUpper;
eosimages = import ./eosimages.nix { inherit config; };
@@ -31,6 +31,8 @@ let
--owner 0 --group 0 | tar2sqfs $out
'';
+ efiArch = stdenv.hostPlatform.efiArch;
+
grub = grub2_efi;
grubCfg = substituteAll {
@@ -74,8 +76,8 @@ let
done
mcopy -i $out ${grub}/share/grub/unicode.pf2 ::/grub/fonts
- grub-mkimage -o grubx64.efi -p "(hd0,gpt1)/grub" -O ${grub.grubTarget} part_gpt fat
- mcopy -i $out grubx64.efi ::/EFI/BOOT/BOOTX64.EFI
+ grub-mkimage -o grub${efiArch}.efi -p "(hd0,gpt1)/grub" -O ${grub.grubTarget} part_gpt fat
+ mcopy -i $out grub${efiArch}.efi ::/EFI/BOOT/BOOT${toUpper efiArch}.EFI
fsck.vfat -n $out
'';
diff --git a/img/live/Makefile b/img/live/Makefile
index 9815c88..e63c598 100644
--- a/img/live/Makefile
+++ b/img/live/Makefile
@@ -36,7 +36,7 @@ build/boot.fat: $(KERNEL) $(INITRAMFS) $(SYSTEMD_BOOT_EFI) build/spectrum.conf
$(MCOPY) -i $@ build/spectrum.conf ::/loader/entries
$(MCOPY) -i $@ $(KERNEL) ::/spectrum/linux
$(MCOPY) -i $@ $(INITRAMFS) ::/spectrum/initrd
- $(MCOPY) -i $@ $(SYSTEMD_BOOT_EFI) ::/EFI/BOOT/BOOTX64.EFI
+ $(MCOPY) -i $@ $(SYSTEMD_BOOT_EFI) ::/EFI/BOOT/$(EFINAME)
# veritysetup format produces two files, but Make only (portably)
# supports one output per rule, so we combine the two outputs then
diff --git a/img/live/default.nix b/img/live/default.nix
index 1fa8da3..4301ccc 100644
--- a/img/live/default.nix
+++ b/img/live/default.nix
@@ -9,7 +9,7 @@
let
inherit (config) pkgs;
- inherit (pkgs.lib) cleanSource cleanSourceWith hasSuffix;
+ inherit (pkgs.lib) cleanSource cleanSourceWith hasSuffix toUpper;
extfs = pkgs.pkgsStatic.callPackage ../../host/initramfs/extfs.nix {
inherit config;
@@ -17,6 +17,7 @@ let
rootfs = import ../../host/rootfs { inherit config; };
scripts = import ../../scripts { inherit config; };
initramfs = import ../../host/initramfs { inherit config rootfs; };
+ efiArch = stdenv.hostPlatform.efiArch;
in
stdenvNoCC.mkDerivation {
@@ -35,7 +36,8 @@ stdenvNoCC.mkDerivation {
INITRAMFS = initramfs;
KERNEL = "${rootfs.kernel}/${stdenv.hostPlatform.linux-kernel.target}";
ROOT_FS = rootfs;
- SYSTEMD_BOOT_EFI = "${systemd}/lib/systemd/boot/efi/systemd-bootx64.efi";
+ SYSTEMD_BOOT_EFI = "${systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
+ EFINAME = "BOOT${toUpper efiArch}.EFI";
buildFlags = [ "build/live.img" ];
makeFlags = [ "SCRIPTS=${scripts}" ];
--
2.25.1
next reply other threads:[~2022-09-29 10:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-29 10:32 Ivan Nikolaenko [this message]
2022-09-29 12:24 ` Alyssa Ross
2022-09-29 12:37 ` Alyssa Ross
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=20220929103234.2460828-1-ivan.nikolaenko@unikie.com \
--to=ivan.nikolaenko@unikie.com \
--cc=devel@spectrum-os.org \
/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.
Code repositories for project(s) associated with this public inbox
https://spectrum-os.org/git/crosvm
https://spectrum-os.org/git/doc
https://spectrum-os.org/git/mktuntap
https://spectrum-os.org/git/nixpkgs
https://spectrum-os.org/git/spectrum
https://spectrum-os.org/git/ucspi-vsock
https://spectrum-os.org/git/www
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).