Revert last set of changes and remove portage version check from emerge in livecd...

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

diff --git a/ChangeLog b/ChangeLog
index 7d6942bb73034a2a09a485c145db1aaa3a085c0e..d197f8b4651962895899ba73c79f8b17a74ec4b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gentoo/src/catalyst 
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.184 2005/03/07 19:52:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.185 2005/03/07 21:14:42 wolf31o2 Exp $
+
+  07 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript-support/kmerge.sh,
+  livecd/runscript-support/pre-kmerge.sh,
+  targets/livecd-stage1/livecd-stage1-chroot.sh:
+  Revert last set of changes and remove portage version check from emerge in
+  livecd-stage1, as it breaks catalyst's ability to fail properly on an
+  incomplete emerge.
 
   07 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/runscript-support/kmerge.sh,

diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
index d7abd4fec826d18e1b6c2bb197f79b6e6b674235..6ffcbf86160e697b40f0560d39f4692d0561b4f9 100755 (executable)
--- a/livecd/runscript-support/kmerge.sh
+++ b/livecd/runscript-support/kmerge.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/livecd/runscript-support/Attic/kmerge.sh,v 1.24 2005/03/07 19:52:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.25 2005/03/07 21:14:42 wolf31o2 Exp $
 
 die() {
        echo "$1"
@@ -102,7 +102,7 @@ ln -s /usr/share/zoneinfo/UTC /etc/localtime
 # Don't use pkgcache here, as the kernel source may get emerge with different USE variables
 # (and thus different patches enabled/disabled.) Also, there's no real benefit in using the
 # pkgcache for kernel source ebuilds.
-emerge -n "${clst_ksource}" || exit 1
+emerge "${clst_ksource}" || exit 1
 [ ! -e /usr/src/linux ] && die "Can't find required directory /usr/src/linux"
        
 #if catalyst has set NULL_VALUE, extraversion wasn't specified so we skip this part

diff --git a/livecd/runscript-support/pre-kmerge.sh b/livecd/runscript-support/pre-kmerge.sh
index 2d8573c549ea1345bc28c7e3c51ba5575a725c94..aff83103c5a9554f3b2e9dfef3812767d64e9c92 100755 (executable)
--- a/livecd/runscript-support/pre-kmerge.sh
+++ b/livecd/runscript-support/pre-kmerge.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.10 2005/03/07 19:52:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.11 2005/03/07 21:14:42 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-if [ ! $(portageq has_version / $(portageq best_version / sys-kernel/genkernel)) ]
+if [ ! -x /usr/share/genkernel/genkernel ]
 then
        emerge -k -b genkernel
 fi
@@ -17,7 +17,8 @@ rm -f /usr/src/linux
 sed -i 's/uchi-hcd/uhci-hcd/' /usr/share/genkernel/x86/modules_load
 
 if [ "${clst_livecd_type}" = "gentoo-release-minimal" ] \
-|| [ "${clst_livecd_type}" = "gentoo-release-universal" ]; then
+|| [ "${clst_livecd_type}" = "gentoo-release-universal" ]
+then
        sed -i 's/initramfs_data.cpio.gz /initramfs_data.cpio.gz -r 1024x768 /'\
        /usr/share/genkernel/genkernel
 fi

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 7c770aca3acee73ca99bd29aa616062d80b9fd7e..768fce0c995c1cf763c94e88540c8bdcaaab8b4c 100755 (executable)
--- 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.14 2005/01/28 18:37:23 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.15 2005/03/07 21:14:42 wolf31o2 Exp $
 
 portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
        | cut -d/ -f2 | cut -d- -f2,3`
@@ -64,15 +64,4 @@ then
        fi
 fi
 
-portage_version=`/usr/lib/portage/bin/portageq best_version / sys-apps/portage \
-       | cut -d/ -f2 | cut -d- -f2,3`
-
-if [ `echo ${portage_version} | cut -d- -f1 | cut -d. -f3` -ge 51 ] &&
-       [ `echo ${portage_version} | cut -d- -f2 | cut -dr -f2` -ge 4 ]
-then
-       emerge ${clst_emergeopts} ${clst_packages}
-else
-       for packages in ${clst_packages}; do
-               emerge ${clst_emergeopts} ${packages}
-       done
-fi
+emerge ${clst_emergeopts} ${clst_packages}