From ba1282a412395be5769760006457614488e067c7 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Thu, 26 Jan 2006 15:35:41 +0000 Subject: [PATCH] Added --oneshot to default options for stage1 building. Added code to wipe world during stages 1 and 3. This is catalyst 2.0_rc22. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1041 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 7 ++++++- targets/stage1/stage1-chroot.sh | 6 ++++-- targets/stage3/stage3-chroot.sh | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 11518e5a..95d37fa2 100644 --- 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 + 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 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 afce9ac7..ea81b2cd 100755 --- 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 63244b0b..e04af4be 100755 --- 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 -- 2.26.2