From 1cd4c2ecb2aa790797beac7f16b0a79c1e9a784c Mon Sep 17 00:00:00 2001 From: ZhonglingHe Date: Thu, 17 Mar 2022 20:15:06 +0800 Subject: [PATCH] support aarch64 build Signed-off-by: zhongling.h --- src/cmd-buildextend-live | 2 +- src/cmd-buildextend-metal | 2 +- src/cmdlib.sh | 2 +- src/vmdeps-aarch64.txt | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 src/vmdeps-aarch64.txt diff --git a/src/cmd-buildextend-live b/src/cmd-buildextend-live index b075c3c0..861100a7 100755 --- a/src/cmd-buildextend-live +++ b/src/cmd-buildextend-live @@ -532,7 +532,7 @@ def generate_iso(): # will give you the right path, but there are exceptions. with open(os.path.join(tmpimageefidir, "BOOT", "grub.cfg"), "w") as fh: fh.write(f'''search --label "{volid}" --set root --no-floppy -set prefix=($root)/EFI/anolis +set prefix=($root)/EFI/lifsea configfile $prefix/grub.cfg boot ''') diff --git a/src/cmd-buildextend-metal b/src/cmd-buildextend-metal index 10a782b9..8790719e 100755 --- a/src/cmd-buildextend-metal +++ b/src/cmd-buildextend-metal @@ -64,7 +64,7 @@ if [ $# -ne 0 ]; then fi case "$basearch" in - "x86_64") ;; + "x86_64"|"aarch64") ;; *) fatal "$basearch is not supported for this command" ;; esac diff --git a/src/cmdlib.sh b/src/cmdlib.sh index d3083583..41621f3a 100755 --- a/src/cmdlib.sh +++ b/src/cmdlib.sh @@ -43,7 +43,7 @@ arch=$(uname -m) export arch case $arch in - "x86_64") DEFAULT_TERMINAL="ttyS0" ;; + "x86_64"|"aarch64") DEFAULT_TERMINAL="ttyS0" ;; *) fatal "Architecture $(arch) not supported" esac export DEFAULT_TERMINAL diff --git a/src/vmdeps-aarch64.txt b/src/vmdeps-aarch64.txt new file mode 100644 index 00000000..24392543 --- /dev/null +++ b/src/vmdeps-aarch64.txt @@ -0,0 +1,6 @@ +# For grub install when creating images without anaconda +grub2 +bootupd + +# For creating bootable UEFI media on x86_64 +shim-aa64 grub2-efi-aa64 -- Gitee