SPECS: kernel-desktop.spec - add missing unionfs config - remove o...

[glen]

Author: glen                         Date: Wed Apr  9 00:40:33 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add missing unionfs config
- remove outdated cpu too old workaround

---- Files affected:
SPECS:
   kernel-desktop.spec (1.177 -> 1.178) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.177 SPECS/kernel-desktop.spec:1.178
--- SPECS/kernel-desktop.spec:1.177	Wed Apr  9 02:36:22 2008
+++ SPECS/kernel-desktop.spec	Wed Apr  9 02:40:28 2008
@@ -101,6 +101,7 @@
 Source19:	%{pname}-imq.config
 Source20:	%{pname}-reiser4.config
 Source21:	%{pname}-squashfs.config
+Source22:	%{pname}-unionfs.config
 
 ###
 #	Patches
@@ -752,6 +753,10 @@
 CONFIGS += %{_sourcedir}/%{pname}-squashfs.config
 %endif
 
+%if %{with unionfs}
+CONFIGS += %{_sourcedir}/%{pname}-unionfs.config
+%endif
+
 %if %{with bootsplash}
 	CONFIGS += %{_sourcedir}/%{pname}-bootsplash.config
 %else
@@ -803,18 +808,11 @@
 	echo 'X86_USE_3DNOW=y'
 	%endif
 	%ifarch i686 athlon pentium3 pentium4
-	%if %{with pae}
-		echo 'HIGHMEM4G=n'
-		echo 'HIGHMEM64G=y'
-		echo 'X86_PAE=y'
-	%endif
-	%endif
-	%ifarch i686 athlon pentium3 pentium4
-	# This issues 'CPU too old' error on Centrino processors
-	# http://lkml.org/lkml/2007/9/18/301
-#	echo 'HIGHMEM4G=n'
-#	echo 'HIGHMEM64G=y'
-#	echo 'X86_PAE=y:'
+		%if %{with pae}
+			echo 'HIGHMEM4G=n'
+			echo 'HIGHMEM64G=y'
+			echo 'X86_PAE=y'
+		%endif
 	echo 'MATH_EMULATION=n'
 	%endif
 %endif
@@ -1160,6 +1158,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.178  2008-04-09 00:40:28  glen
+- add missing unionfs config
+- remove outdated cpu too old workaround
+
 Revision 1.177  2008-04-09 00:36:22  glen
 - renum sources to avoid collision
 - NOTE: ck patch swappiness patch makes unresolved syms
================================================================

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