Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/support/
Date: Sun, 30 Jan 2022 20:43:01
Message-Id: 1627519002.e0b9b007b563188cca5f5317f780bb5d4bbb17d1.mattst88@gentoo
1 commit: e0b9b007b563188cca5f5317f780bb5d4bbb17d1
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 25 23:51:12 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 29 00:36:42 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e0b9b007
7
8 targets: Add arm64 livecd support
9
10 Closes: https://bugs.gentoo.org/785769
11 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 targets/support/bootloader-setup.sh | 2 +-
15 targets/support/create-iso.sh | 7 +++++--
16 2 files changed, 6 insertions(+), 3 deletions(-)
17
18 diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
19 index ea18f736..4cfa61eb 100755
20 --- a/targets/support/bootloader-setup.sh
21 +++ b/targets/support/bootloader-setup.sh
22 @@ -87,7 +87,7 @@ case ${clst_hostarch} in
23 echo "--recoverykernel=boot/${x}" >> ${icfg}
24 done
25 ;;
26 - amd64|ia64|ppc*|powerpc*|sparc*|x86)
27 + amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
28 kern_subdir=/boot
29 iacfg=$1/boot/grub/grub.cfg
30 mkdir -p $1/boot/grub
31
32 diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
33 index 9b2cbb60..838962fe 100755
34 --- a/targets/support/create-iso.sh
35 +++ b/targets/support/create-iso.sh
36 @@ -18,7 +18,7 @@ case ${clst_hostarch} in
37 cdmaker="grub-mkrescue"
38 cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
39 ;;
40 - amd64|ia64|x86)
41 + amd64|arm64|ia64|x86)
42 cdmaker="grub-mkrescue"
43 # grub-mkrescue requires:
44 # xorriso from libisoburn
45 @@ -52,6 +52,9 @@ then
46 arm)
47 clst_iso_volume_id="Gentoo Linux - ARM"
48 ;;
49 + arm64)
50 + clst_iso_volume_id="Gentoo Linux - ARM64"
51 + ;;
52 hppa)
53 clst_iso_volume_id="Gentoo Linux - HPPA"
54 ;;
55 @@ -188,7 +191,7 @@ case ${clst_hostarch} in
56 # o= output image (burnable to CD; readable by fdisk)
57 /usr/bin/sgibootcd c=${cfg} o=${clst_iso}
58 ;;
59 - amd64|ia64|ppc*|powerpc*|sparc*|x86)
60 + amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
61 isoroot_checksum
62
63 extra_opts=("-joliet")