Check for the correct arch specific cd building tool

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

diff --git a/ChangeLog b/ChangeLog
index fa304e23f34d1541245a7c2a49697128d8e8be4e..2329df5d0ec378268b06231924de336a722f8559 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.354 2005/10/13 17:13:35 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.355 2005/10/13 17:15:57 rocket Exp $
+
+  13 Oct 2005; Eric Edgar <rocket@gentoo.org> targets/support/create-iso.sh:
+  Check for the correct arch specific cd building tool
 
   13 Oct 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 2fa2ba56e02e89c0398358364e87642c5a4071c6..01a62fb7a6c973fb2b64cc52729ddd8d94e15a75 100755 (executable)
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -1,19 +1,23 @@
 # Copyright 1999-2005 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.10 2005/08/09 19:02:31 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/support/create-iso.sh,v 1.11 2005/10/13 17:15:57 rocket Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
 ## START RUNSCRIPT
 
-if [ ! -f /usr/bin/mkisofs ]
-then
-       echo
-       echo
-       die "        /usr/bin/mkisofs is not found.  Have you merged cdrtools?"
-       echo
-       echo
-fi
+# Check for our CD ISO creation tools
+case ${clst_mainarch} in
+   mips)   cdmaker="sgibootcd";    cdmakerpkg="sys-boot/sgibootcd" ;;
+   *)  cdmaker="mkisofs";  cdmakerpkg="app-cdr/cdrtools"   ;;
+esac
+
+[ ! -f /usr/bin/${cdmaker} ] \
+   && echo && echo \
+   && die "!!! /usr/bin/${cdmaker} is not found.  Have you merged ${cdmakerpkg}?" \
+   && echo && echo
+
+
 
 # If not volume ID is set, make up a sensible default
 if [ -z "${clst_iso_volume_id}" ]