[gentoo-commits] proj/catalyst:master commit in: livecd/cdtar/, targets/support/

[gentoo-commits] proj/catalyst:master commit in: livecd/cdtar/, targets/support/

[Matt Turner]

commit:     9be399147ac1ff86deaabbd85c733da293c5bce9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  7 19:42:05 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 02:12:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9be39914

targets: Switch from elilo to GRUB on ia64

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 livecd/cdtar/elilo-3.6-cdtar.tar.bz2 | Bin 129254 -> 0 bytes
 targets/support/bootloader-setup.sh  |  38 +----------------------------------
 targets/support/create-iso.sh        |  37 +++++-----------------------------
 3 files changed, 6 insertions(+), 69 deletions(-)

diff --git a/livecd/cdtar/elilo-3.6-cdtar.tar.bz2 b/livecd/cdtar/elilo-3.6-cdtar.tar.bz2
deleted file mode 100644
index 6d8da372..00000000
Binary files a/livecd/cdtar/elilo-3.6-cdtar.tar.bz2 and /dev/null differ

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index c52e0907..52c3508d 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -80,8 +80,7 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	ppc*|powerpc*|sparc*)
-	    # GRUB2 Openfirmware
+	ia64|ppc*|powerpc*|sparc*)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub
@@ -120,41 +119,6 @@ case ${clst_hostarch} in
 			echo "" >> ${iacfg}
 		done
 	;;
-	ia64)
-		# NO SOFTLEVEL SUPPORT YET
-		iacfg=$1/boot/elilo.conf
-		echo 'prompt' > ${iacfg}
-		echo 'message=/efi/boot/elilo.msg' >> ${iacfg}
-		echo 'chooser=simple' >> ${iacfg}
-		echo 'timeout=50' >> ${iacfg}
-		echo 'relocatable' >> ${iacfg}
-		echo >> ${iacfg}
-		for x in ${clst_boot_kernel}
-		do
-			echo "image=/efi/boot/${x}" >> ${iacfg}
-			echo "  label=${x}" >> ${iacfg}
-			echo '  append="'initrd=${x}.igz ${default_append_line}'"' >> ${iacfg}
-			echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
-			echo >> ${iacfg}
-			echo "image=/efi/boot/${x}" >> ${iacfg}
-			echo "  label=${x}-serial">> ${iacfg}
-			echo '  append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttyS0,9600"' >> ${iacfg}
-			echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
-			echo >> ${iacfg}
-			echo "image=/efi/boot/${x}" >> ${iacfg}
-			echo "  label=${x}-ilo">> ${iacfg}
-			echo '  append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttyS3,9600"' >> ${iacfg}
-			echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
-			echo >> ${iacfg}
-			echo "image=/efi/boot/${x}" >> ${iacfg}
-			echo "  label=${x}-sgi">> ${iacfg}
-			echo '  append="'initrd=${x}.igz ${default_append_line}' console=tty0 console=ttySG0,115200"' >> ${iacfg}
-			echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
-			echo >> ${iacfg}
-			mv $1/boot/${x}{,.igz} $1/boot/efi/boot
-		done
-		cp ${iacfg} $1/boot/efi/boot
-	;;
 	x86|amd64)
 		if [ -e $1/isolinux/isolinux.bin ]
 		then

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 955fedd0..d3e20169 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -19,6 +19,10 @@ case ${clst_hostarch} in
                 cdmaker="grub-mkrescue"
                 cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
                 ;;
+	ia64)
+		cdmaker="grub-mkrescue"
+		cdmakerpkg="sys-fs/mtools, dev-libs/libisoburn, and sys-boot/grub:2"
+		;;
 	*)
 		cdmaker="mkisofs"
 		cdmakerpkg="virtual/cdrtools"
@@ -132,37 +136,6 @@ case ${clst_hostarch} in
 		palo -f boot/palo.conf -C "${1}"
 		popd
 	;;
-	ia64)
-		if [ ! -e "${clst_target_path}/gentoo.efimg" ]
-		then
-			iaSizeTemp=$(du -sk --apparent-size "${clst_target_path}/boot" 2>/dev/null)
-			iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
-			iaSize=$((${iaSizeB}+64)) # Add slack
-
-			dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
-				count=${iaSize}
-			mkfs.vfat -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
-
-			mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
-			mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
-				"${clst_target_path}/gentoo.efimg.mountPoint"
-
-			echo '>> Populating EFI image...'
-			cp -rv "${clst_target_path}"/boot/* \
-				"${clst_target_path}/gentoo.efimg.mountPoint" || die "Failed to populate EFI image"
-
-			umount "${clst_target_path}/gentoo.efimg.mountPoint"
-			rmdir "${clst_target_path}/gentoo.efimg.mountPoint"
-		else
-			echo ">> Found populated EFI image at \
-				${clst_target_path}/gentoo.efimg"
-		fi
-		echo '>> Removing /boot...'
-		rm -rf "${clst_target_path}/boot"
-
-		echo ">> Running mkisofs to create iso image...."
-		run_mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
-	;;
 	mips)
 		case ${clst_fstype} in
 			squashfs)
@@ -220,7 +193,7 @@ case ${clst_hostarch} in
 			*) die "SGI LiveCD(s) only support the 'squashfs' fstype!"	;;
 		esac
 	;;
-	ppc*|powerpc*|sparc*)
+	ia64|ppc*|powerpc*|sparc*)
 		isoroot_checksum
 
 		case ${clst_hostarch} in