added autogen iso support

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

diff --git a/ChangeLog b/ChangeLog
index 5b08cfd25174985138aaa178e42528b5357c1893..397729542d3e2ff38723538ba410f30f99db78bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.25 2004/03/22 15:25:52 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.26 2004/03/23 07:20:34 zhen Exp $
+
+  23 Mar 2004; John Davis <zhen@gentoo.org>
+  livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh,
+  livecd/runscript/ppc-archscript.sh, livecd/runscript/sparc64-archscript.sh,
+  livecd/runscript/x86-archscript.sh, modules/targets.py,
+  targets/livecd-stage3/unmerge.sh:
+  added "livecd/iso" to targets.py and fixed up the archscripts so that isos are
+  created at the end of the livecd-stage2 process.
 
   22 Mar 2004; John Davis <zhen@gentoo.org> modules/targets.py,
   targets/embedded/embedded.sh:

diff --git a/livecd/runscript/alpha-archscript.sh b/livecd/runscript/alpha-archscript.sh
index 043501406aabd7cca1b1ae0b351c8d80ab6958ab..d002ee8f23cdc372d1a4a53a0d9531dfcfc35208 100755 (executable)
--- a/livecd/runscript/alpha-archscript.sh
+++ b/livecd/runscript/alpha-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/alpha-archscript.sh,v 1.1 2004/03/04 23:29:45 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/alpha-archscript.sh,v 1.2 2004/03/23 07:20:34 zhen Exp $
 
 case $1 in
        kernel)
@@ -69,14 +69,14 @@ case $1 in
        iso)
                # this is for the livecd-final target, and calls the proper
                # command to build the iso file
-               case $clst_livecd_cdfstype in
+               case ${clst_livecd_cdfstype} in
                        zisofs)
-                               mkisofs -J -R -l -z -o ${clst_iso_path} $clst_cdroot_path
+                               mkisofs -J -R -l -z -o ${2} ${clst_cdroot_path}
                        ;;
                        *)
-                               mkisofs -J -R -l -o ${clst_iso_path} $clst_cdroot_path
+                               mkisofs -J -R -l -o ${2} ${clst_cdroot_path}
                        ;;
                esac
-               isomarkboot $clst_iso_path /boot/bootlx
+               isomarkboot ${2} /boot/bootlx
        ;;
 esac

diff --git a/livecd/runscript/hppa-archscript.sh b/livecd/runscript/hppa-archscript.sh
index c575eac481bfc414918d32d56db8803f524e7263..9cd299e1f9e4ecc0471cb89139a0056959efb6dc 100644 (file)
--- a/livecd/runscript/hppa-archscript.sh
+++ b/livecd/runscript/hppa-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/hppa-archscript.sh,v 1.1 2004/03/07 12:29:47 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/hppa-archscript.sh,v 1.2 2004/03/23 07:20:34 zhen Exp $
 
 case $1 in
        kernel)
@@ -73,7 +73,7 @@ case $1 in
 
        iso)
                #this is for the livecd-final target, and calls the proper command to build the iso file
-               mkisofs -J -R -r -l -o ${clst_iso_path} $clst_cdroot_path
-               palo -f boot/palo.conf -C ${clst_iso_path}
+               mkisofs -J -R -l -o  ${2} ${clst_cdroot_path}
+               palo -f boot/palo.conf -C ${2}
        ;;
 esac

diff --git a/livecd/runscript/ppc-archscript.sh b/livecd/runscript/ppc-archscript.sh
index edfc90e62ab6f2cff6ab66eb2b194b4bf235cfae..568ae26b0f46a12dfee0ffaec91b38db94500158 100644 (file)
--- a/livecd/runscript/ppc-archscript.sh
+++ b/livecd/runscript/ppc-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/ppc-archscript.sh,v 1.1 2004/03/04 23:29:45 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/ppc-archscript.sh,v 1.2 2004/03/23 07:20:34 zhen Exp $
 
 case $1 in
        kernel)
@@ -68,6 +68,6 @@ case $1 in
 
        iso)
                # The name of the iso should be retrieved from the specs. For now, asssume GentooPPC_2004.0
-               mkisofs -J -r -netatalk -hfs -probe -map boot/map.hfs -part -no-desktop -hfs-volid GentooPPC_2004.0 -hfs-bless ./boot -o ${clst_iso_path} ${clst_cdroot_path}
+               mkisofs -J -r -netatalk -hfs -probe -map boot/map.hfs -part -no-desktop -hfs-volid GentooPPC_2004.0 -hfs-bless ./boot -o ${2} ${clst_cdroot_path}
        ;;
 esac

diff --git a/livecd/runscript/sparc64-archscript.sh b/livecd/runscript/sparc64-archscript.sh
index 71a51263e1ceb0e34e7729bb41c30a834726a506..ffe5643db7b810ad3786a39268d29506fa7b2d40 100644 (file)
--- a/livecd/runscript/sparc64-archscript.sh
+++ b/livecd/runscript/sparc64-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.1 2004/03/04 23:29:45 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/sparc64-archscript.sh,v 1.2 2004/03/23 07:20:34 zhen Exp $
 
 case $1 in
        kernel)
@@ -82,7 +82,6 @@ case $1 in
        iso)
                # this is for the livecd-final target, and calls the proper
                # command to build the iso file
-               mkisofs -J -R -l -z -o ${clst_iso_path} -G /boot/isofs.b -B ... \
-                   $clst_cdroot_path
+               mkisofs -J -R -l -z -o ${2} -G /boot/isofs.b -B ... ${clst_cdroot_path}
        ;;
 esac

diff --git a/livecd/runscript/x86-archscript.sh b/livecd/runscript/x86-archscript.sh
index f840a081975113a4d4286b4c1b4f99ebc60191c3..94325bdcc416ed272a33e41f46c81be6e1f2667e 100644 (file)
--- a/livecd/runscript/x86-archscript.sh
+++ b/livecd/runscript/x86-archscript.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.1 2004/03/04 23:29:45 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript/Attic/x86-archscript.sh,v 1.2 2004/03/23 07:20:34 zhen Exp $
 
 case $1 in
        kernel)
@@ -78,7 +78,6 @@ case $1 in
 
        iso)
                #this is for the livecd-final target, and calls the proper command to build the iso file
-               mkisofs -J -R -l -o ${clst_iso_path} -b isolinux/isolinux.bin -c isolinux/boot.cat \
-                       -no-emul-boot -boot-load-size 4 -boot-info-table $clst_cdroot_path
+               mkisofs -J -R -l -o  ${2} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -z ${clst_cdroot_path}
        ;;
 esac

diff --git a/modules/targets.py b/modules/targets.py
index 824b4c05218386e112e4526ee3ca9db602f34c87..cbddffa5d8124098ed0f75af83da1c9839a4e804 100644 (file)
--- a/modules/targets.py
+++ b/modules/targets.py
@@ -1,6 +1,6 @@
 # Distributed under the GNU General Public License version 2
 # Copyright 2003-2004 Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.92 2004/03/22 15:25:52 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/Attic/targets.py,v 1.93 2004/03/23 07:20:34 zhen Exp $
 
 import os,string,imp,types,shutil
 from catalyst_support import *
@@ -431,11 +431,11 @@ class livecd_stage1_target(generic_stage_target):
                        cmd("/bin/bash "+self.settings["sharedir"]+"/targets/livecd-stage1/livecd-stage1.sh run "+mypack)
                except CatalystError:
                        self.unbind()
-                       raise CatalystError,"GRP build aborting due to error."
+                       raise CatalystError,"LiveCD stage1 build aborting due to error."
 
 class livecd_stage2_target(generic_stage_target):
        def __init__(self,spec,addlargs):
-               self.required_values=["boot/kernel","livecd/cdfstype","livecd/archscript","livecd/runscript"]
+               self.required_values=["boot/kernel","livecd/cdfstype","livecd/archscript","livecd/runscript","livecd/iso"]
                self.valid_values=[]
                if not addlargs.has_key("boot/kernel"):
                        raise CatalystError, "Required value boot/kernel not specified."
@@ -508,7 +508,8 @@ class livecd_stage2_target(generic_stage_target):
 
        def cdroot_setup(self):
                cmd("/bin/bash "+self.settings["livecd/runscript"]+" cdfs","cdfs runscript failed.")
-               print "livecd-stage3: complete!"
+               cmd("/bin/bash "+self.settings["livecd/runscript"]+" iso "+self.settings["livecd/iso"],"iso runscript failed.")
+               print "livecd-stage2: complete!"
 
        def run_local(self):
                #first clean up any existing cdroot stuff

diff --git a/targets/livecd-stage3/unmerge.sh b/targets/livecd-stage3/unmerge.sh
deleted file mode 100644 (file)
index 992b7f3..0000000
--- a/targets/livecd-stage3/unmerge.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage3/Attic/unmerge.sh,v 1.1 2004/01/10 22:23:44 drobbins Exp $
-
-$clst_CHROOT $clst_chroot_path /bin/bash << EOF
-       emerge -C $*
-EOF
-exit 0