From 61d9762527421c50ea8b6a6e45324a199c43e827 Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Thu, 13 Oct 2005 17:15:57 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 ++++- targets/support/create-iso.sh | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa304e23..2329df5d 100644 --- 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 targets/support/create-iso.sh: + Check for the correct arch specific cd building tool 13 Oct 2005; Eric Edgar modules/generic_stage_target.py: diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh index 2fa2ba56..01a62fb7 100755 --- 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}" ] -- 2.26.2