Change genkernel check to use best_version and has_version to determine if the any...

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

diff --git a/ChangeLog b/ChangeLog
index 1b0f7aa57d62f64394ae552e4206859f2a77416d..7d6942bb73034a2a09a485c145db1aaa3a085c0e 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.183 2005/03/07 00:20:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.184 2005/03/07 19:52:00 wolf31o2 Exp $
+
+  07 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/runscript-support/kmerge.sh,
+  livecd/runscript-support/pre-kmerge.sh:
+  Change genkernel check to use best_version and has_version to determine if
+  the any previously installed versions of genkernel are up to date. Change
+  emerge line for kernels to use -n option to only install if they were not
+  previously installed.
 
   06 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   livecd/cdtar/silo-1.2.6-sparc-cdtar.tar.bz2,

diff --git a/livecd/runscript-support/kmerge.sh b/livecd/runscript-support/kmerge.sh
index bafd42fa87cf28d90f8130322c5fdd4428b494f5..d7abd4fec826d18e1b6c2bb197f79b6e6b674235 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.23 2005/02/28 23:21:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/kmerge.sh,v 1.24 2005/03/07 19:52:00 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 "${clst_ksource}" || exit 1
+emerge -n "${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 9e0571b782db696fec1c5382a4b53edc884ce7b7..2d8573c549ea1345bc28c7e3c51ba5575a725c94 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.9 2005/03/06 14:35:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/pre-kmerge.sh,v 1.10 2005/03/07 19:52:00 wolf31o2 Exp $
 
 /usr/sbin/env-update
 source /etc/profile
 
-if [ ! -e "/usr/bin/genkernel" ]
+if [ ! $(portageq has_version / $(portageq best_version / sys-kernel/genkernel)) ]
 then
        emerge -k -b genkernel
 fi