Added --oneshot to default options for stage1 building. Added code to wipe world...

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

diff --git a/ChangeLog b/ChangeLog
index 11518e5a384747f327ab58e4c96e3b28953048e3..95d37fa24ede64f502cec4a83ef35ffa2c5344ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.526 2006/01/25 16:07:35 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.527 2006/01/26 15:35:41 wolf31o2 Exp $
+
+  26 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-chroot.sh, targets/stage3/stage3-chroot.sh:
+  Added --oneshot to default options for stage1 building. Added code to wipe
+  world during stages 1 and 3. This is catalyst 2.0_rc22.
 
   25 Jan 2006; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py, targets/support/bootloader-setup.sh:

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index afce9ac7a385eb835c6d4103c8b566a8548810f8..ea81b2cde72db5ccbcfe8e9d1d2a0d71e0a99175 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-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/stage1/stage1-chroot.sh,v 1.41 2005/12/19 15:23:50 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.42 2006/01/26 15:35:41 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -26,6 +26,8 @@ then
 fi
 
 ## START BUILD
-run_emerge "--noreplace ${clst_buildpkgs}"
+run_emerge "--noreplace --oneshot ${clst_buildpkgs}"
+rm -f /var/lib/portage/world
+touch /var/lib/portage/world
 
 rm -f /var/log/emerge.log

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index 63244b0b268a3449faaeb994ac5c351158ce605f..e04af4be4bd52fe4a64f347d4a2f30ca6d0c3fd3 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-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/stage3/stage3-chroot.sh,v 1.26 2005/12/19 15:28:42 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.27 2006/01/26 15:35:41 wolf31o2 Exp $
 
 . /tmp/chroot-functions.sh
 
@@ -21,3 +21,5 @@ export USE="${USE} ${clst_HOSTUSE}"
 setup_portage
 
 run_emerge "-e system"
+rm -f /var/lib/portage/world
+touch /var/lib/portage/world