From 84913d5476fef2d3cc6e04ccb47a4f51755f5f70 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 7 Mar 2005 21:14:42 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@559 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 10 +++++++++- livecd/runscript-support/kmerge.sh | 4 ++-- livecd/runscript-support/pre-kmerge.sh | 7 ++++--- targets/livecd-stage1/livecd-stage1-chroot.sh | 15 ++------------- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d6942bb..d197f8b4 100644 --- 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 + 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 livecd/runscript-support/kmerge.sh, diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh index d7abd4fe..6ffcbf86 100755 --- 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 2d8573c5..aff83103 100755 --- 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 7c770aca..768fce0c 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.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} -- 2.26.2