Add IA64 LiveCD jojo-dojo.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@733 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/livecd/cdtar/elilo-3.4-cdtar.tar.bz2 b/livecd/cdtar/elilo-3.4-cdtar.tar.bz2
new file mode 100644 (file)
index 0000000..ed9e3d1
Binary files /dev/null and b/livecd/cdtar/elilo-3.4-cdtar.tar.bz2 differ

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index be3632486e897ec6d86b6402a2cb9eada53c186c..5368d56348a5d5d7cd6bbb3947d16cdf94687de0 100755 (executable)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.8 2005/06/30 16:07:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/bootloader-setup.sh,v 1.9 2005/07/05 17:20:05 plasmaroo Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -91,6 +91,29 @@ case ${clst_mainarch} in
                echo "image=\"cat /boot/help.msg\"" >> ${scfg}
                echo -e "label=\"help\"" >> ${scfg}
                ;;
+       ia64)
+               iacfg=$1/boot/elilo.conf
+               echo 'prompt' > ${iacfg}
+               echo 'message=/efi/boot/elilo.msg' >> ${iacfg}
+               echo 'chooser=simple' >> ${iacfg}
+               echo 'timeout=50' >> ${iacfg}
+               echo >> ${iacfg}
+               for x in ${clst_boot_kernel}
+               do
+                       echo "image=/efi/boot/${x}" >> ${iacfg}
+                       echo "  label=${x}" >> ${iacfg}
+                       echo '  append="'${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="'${default_append_line}' console=tty0 console=ttyS0,9600"' >> ${iacfg}
+                       echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
+                       echo >> ${iacfg}
+               done
+               cp ${iacfg} $1/boot/efi/boot
+               mv $1/boot/${x}{,.igz} $1/boot/efi/boot
+               ;;
        x86|amd64)
                if [ -e $1/boot/isolinux.bin ]
                then

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index f44ba32ff8d1de9f36ba5232f3e67a3e38796496..2ba427798d300283192b23f0652d1d43a7b4f050 100755 (executable)
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.6 2005/06/28 22:47:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.7 2005/07/05 17:20:05 plasmaroo Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 #. ${clst_sharedir}/targets/${clst_target}/${clst_mainarch}-archscript.sh
@@ -118,7 +118,34 @@ case ${clst_mainarch} in
                rm /tmp/mkisofs.sparc.fu
                                                                                                                        
        ;;
-       
+       ia64)
+               if [ ! -e ${clst_target_path}/gentoo.efimg ]
+               then
+                       iaSizeTemp=$(du -sk ${clst_target_path}/boot 2>/dev/null)
+                       iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
+                       iaSize=$((${iaSizeB}+32)) # Add slack
+
+                       dd if=/dev/zero of=${clst_target_path}/gentoo.efimg bs=1k count=${iaSize}
+                       mkdosfs -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 -av ${clst_target_path}/boot/* ${clst_target_path}/gentoo.efimg.mountPoint
+
+                       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 '>> Generating ISO...'
+               mkisofs -J -R -l -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot \
+                       ${clst_target_path} || die "Cannot make ISO image" 
+       ;;      
        x86|amd64)
                if [ -e ${clst_target_path}/boot/isolinux.bin ]
                then