packages (Titanium): kernel-desktop/kernel-desktop.spec - uhm, better this ...

[shadzik]

Author: shadzik                      Date: Tue Jul 27 09:24:21 2010 GMT
Module: packages                      Tag: Titanium
---- Log message:
- uhm, better this way, now CMOV is really disabled on i586

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.114 -> 1.204.2.115) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.114 packages/kernel-desktop/kernel-desktop.spec:1.204.2.115
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.114	Tue Jul 27 10:59:22 2010
+++ packages/kernel-desktop/kernel-desktop.spec	Tue Jul 27 11:24:13 2010
@@ -479,7 +479,6 @@
 	%endif
 	%ifarch i586
 	sed -i 's:# CONFIG_M586 is not set:CONFIG_M586=y:' $1
-	sed -i 's:CONFIG_X86_CMOV=y:# CONFIG_X86_CMOV is not set:' $1
 	%endif
 	%ifarch i686
 	sed -i 's:# CONFIG_M686 is not set:CONFIG_M686=y:' $1
@@ -517,6 +516,10 @@
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" %{defconfig}}
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" %{defconfig}}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" %{defconfig}}
+	
+%ifarch i586
+%__sed -i 's:CONFIG_X86_CMOV=y:# CONFIG_X86_CMOV is not set:' %{defconfig}
+%endif
 
 %if %{with laptop}
 %__sed -i "s:# CONFIG_HZ_100 is not set:CONFIG_HZ_100=y:" %{defconfig}
@@ -982,6 +985,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.115  2010/07/27 09:24:13  shadzik
+- uhm, better this way, now CMOV is really disabled on i586
+
 Revision 1.204.2.114  2010/07/27 08:59:22  shadzik
 - disable CMOV on i586
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop.spec?r1=1.204.2.114&r2=1.204.2.115&f=u