From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 12 Apr 2007 12:00:09 +0000 (+0000)
Subject: Commented out the package.provided code in catalyst that seemed to cause problems... 
X-Git-Tag: CATALYST_2_0_6_916~264
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e9fc4bb54d70ee588aa07f99d1c288d9d38d595;p=catalyst.git

Commented out the package.provided code in catalyst that seemed to cause problems with kerncache in testing.  This is 2.0.4 and should be used for the 2007.0 release.

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

diff --git a/ChangeLog b/ChangeLog
index c69861e4..81ce3355 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/kmerge.sh:
+  Commented out the package.provided code in catalyst that seemed to cause
+  problems with kerncache in testing. This is 2.0.4 and should be used for the
+  2007.0 release.
+
   12 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/netboot2_target.py, targets/netboot2/netboot2-controller.sh,
   targets/netboot2/netboot2-copyfile.sh, targets/support/functions.sh,
diff --git a/catalyst b/catalyst
index 79679a4e..a8c07ee0 100755
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.3"
+__version__="2.0.4"
 
 conf_values={}
 
diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 490dce04..74daffff 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -175,17 +175,17 @@ mkdir -p /tmp/kerncache/${clst_kname}
 if [ -n "${clst_KERNCACHE}" ]
 then
    	ROOT=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} USE="${USE} symlink build" emerge --nodeps -uqkb  "${clst_ksource}" || exit 1
-	KERNELVERSION=`/usr/lib/portage/bin/portageq best_visible / "${clst_ksource}"`
-	if [ ! -e /etc/portage/profile/package.provided ]
-	then
-		mkdir -p /etc/portage/profile
-		echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
-	else
-		if ( ! grep -q "^${KERNELVERSION}"  /etc/portage/profile/package.provided ) 
-		then
-			echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided
-		fi
-	fi
+#	KERNELVERSION=`/usr/lib/portage/bin/portageq best_visible / "${clst_ksource}"`
+#	if [ ! -e /etc/portage/profile/package.provided ]
+#	then
+#		mkdir -p /etc/portage/profile
+#		echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
+#	else
+#		if ( ! grep -q "^${KERNELVERSION}"  /etc/portage/profile/package.provided ) 
+#		then
+#			echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided
+#		fi
+#	fi
 	[ -d /usr/src/linux ] && rm /usr/src/linux
 	ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
 else