Changed to clst_use from clst_embedded_use and clst_netboot_use and clst_grp_use...

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

diff --git a/ChangeLog b/ChangeLog
index 271b70d5737d932f52a16bb381dd4031d89f2c7a..1610903c4425ac400ad00f07822556daa57e6ec7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.404 2005/11/29 20:20:02 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.405 2005/11/29 20:30:42 wolf31o2 Exp $
+
+  29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/embedded/embedded-chroot.sh, targets/grp/grp-chroot.sh,
+  targets/netboot/netboot-controller.sh:
+  Changed to clst_use from clst_embedded_use and clst_netboot_use and
+  clst_grp_use. This is catalyst-2.0_rc1.
 
   29 Nov 2005; Eric Edgar <rocket@gentoo.org>
   targets/netboot/netboot-controller.sh:

diff --git a/catalyst b/catalyst
index aad8de97fb304446a41340c4f60268e0bc56d14f..494301ab57ed6d856d27c2528bf357451ecd16d8 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.101 2005/11/29 15:24:43 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.102 2005/11/29 20:30:42 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -10,7 +10,7 @@
 import os,sys,imp,string,getopt
 import pdb
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_pre20051129"
+__version__="2.0_rc1"
 
 conf_values={}
 

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index 6dfb2836dc1d9d662ccfe42b2a7390afec27bc63..22ced74835daa89aca7db1ceb9b31600ae487eac 100755 (executable)
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.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/embedded/embedded-chroot.sh,v 1.16 2005/07/05 21:53:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.17 2005/11/29 20:30:42 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -17,7 +17,7 @@ setup_myemergeopts
 export FEATURES="${clst_myfeatures}"
 export CONFIG_PROTECT="-*"
 #export clst_myemergeopts="${clst_myemergeopts} -O"
-export USE="${clst_embedded_use}"
+export USE="${clst_use}"
 export DESTROOT=${clst_root_path}
 export clst_root_path=/
 ## START BUILD

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index 4f4c4006cba6b31d7b0662ee0339e989173ed851..8eaea9297bf1d52becffca44880bf325b732e703 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.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/grp/grp-chroot.sh,v 1.21 2005/08/09 19:02:31 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.22 2005/11/29 20:30:42 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -26,7 +26,7 @@ export USE_ORDER="env:pkg:conf:defaults"
 unset DISTDIR
 
 #don't grab MS core fonts, etc.
-export USE="${USE} ${clst_grp_use}"
+export USE="${USE} ${clst_use}"
        
 if [ "${clst_grp_type}" = "pkgset" ]
 then

diff --git a/targets/netboot/netboot-controller.sh b/targets/netboot/netboot-controller.sh
index 6fca03f653f5942e58377328a2bd1d17959deb66..d66d1862a5228d0bb75f128900b46220d035264a 100755 (executable)
--- a/targets/netboot/netboot-controller.sh
+++ b/targets/netboot/netboot-controller.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/netboot/netboot-controller.sh,v 1.5 2005/11/29 20:20:02 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/netboot/netboot-controller.sh,v 1.6 2005/11/29 20:30:42 wolf31o2 Exp $
 . ${clst_sharedir}/targets/support/functions.sh
 . ${clst_sharedir}/targets/support/filesystem-functions.sh
 
@@ -23,12 +23,12 @@ case ${1} in
                then
                        mkdir -p ${clst_chroot_path}/etc/busybox/${clst_CHOST}
                        cp -v ${clst_netboot_busybox_config} ${clst_chroot_path}/etc/busybox/${clst_CHOST}/busybox.config
-                       clst_netboot_use="savedconfig" 
+                       clst_use="savedconfig" 
                fi
                
                # Main Busybox emerge
                clst_root_path="/" \
-               clst_netboot_use="${clst_use} netboot" \
+               clst_use="${clst_use} netboot" \
                clst_myemergeopts="${clst_myemergeopts} -O" \
                clst_packages="busybox" \
                exec_in_chroot ${clst_sharedir}/targets/${clst_target}/${clst_target}-chroot.sh