Changing the way we determine if extraversion is set. This is catalyst 2.0_rc32.

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

diff --git a/ChangeLog b/ChangeLog
index 699a0a79408338d797a1965bb91fb5f2358e8443..feab87b9f3eaa0223fa98111aab378fe6e8223f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.559 2006/02/07 18:20:39 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.560 2006/02/07 22:29:18 wolf31o2 Exp $
+
+  07 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/support/kmerge.sh:
+  Changing the way we determine if extraversion is set. This is catalyst
+  2.0_rc32.
 
   07 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/catalyst b/catalyst
index 02282f9d39b4d9b2b33f20d62a0dfd820c1eeefd..a31d53a25164aa3f6ee242a60ff1c323f6f32117 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python -OO
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.139 2006/02/06 17:50:10 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.140 2006/02/07 22:29:18 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -11,7 +11,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0_rc31"
+__version__="2.0_rc32"
 
 conf_values={}
 

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index a69109950ffd68c6f057e34daa90dcb51ea63f4c..86dd0fd4f03087018e26999f1f912f5d93089ffe 100755 (executable)
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -206,12 +206,12 @@ fi
 
 # If catalyst has set to a empty string, extraversion wasn't specified so we
 # skip this part
-if [ "${EXTRAVERSION_MATCH}" != "1" ]
+if [ "${EXTRAVERSION_MATCH}" = "0" ]
 then
-       if [ "${clst_kextraversion}" != "" ]
+       if [ ! "${clst_kextraversion}" = "" ]
        then
-       echo "Setting extraversion to ${clst_kextraversion}"
-       sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
+               echo "Setting extraversion to ${clst_kextraversion}"
+               sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
                echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
        else 
                touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION