From: Chris Gianelloni Date: Wed, 15 Dec 2004 00:50:35 +0000 (+0000) Subject: Changed livecd-stage1 to merge each package individually. This should not make it... X-Git-Tag: CATALYST_2_0_6_916~879 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d3094e8a5f9e145ef4037abcf488c081db83de1;p=catalyst.git Changed livecd-stage1 to merge each package individually. This should not make it into a production version of catalyst, but is here as a possible solution to bug #68307. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@494 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 25026d8c..1d27d113 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.121 2004/12/12 16:39:11 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.122 2004/12/15 00:50:35 wolf31o2 Exp $ + + 14 Dec 2004; Chris Gianelloni + targets/livecd-stage1/livecd-stage1-chroot.sh: + Changed livecd-stage1 to merge each package individually. This should not + make it into a production version of catalyst, but is here as a possible + solution to bug #68307. 12 Dec 2004; Chris Gianelloni livecd/runscript/alpha-archscript.sh, livecd/runscript/hppa-archscript.sh, diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh index 3264ca8f..18fd89d8 100755 --- a/targets/livecd-stage1/livecd-stage1-chroot.sh +++ b/targets/livecd-stage1/livecd-stage1-chroot.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.9 2004/10/15 02:46:58 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.10 2004/12/15 00:50:35 wolf31o2 Exp $ /usr/sbin/env-update source /etc/profile @@ -44,4 +44,6 @@ then sleep 15 fi -emerge ${clst_emergeopts} ${clst_packages} +for packages in ${clst_packages}; do + emerge ${clst_emergeopts} ${packages} +done