SPECS (LINUX_2_6): kernel.spec - updated/fixed

[cieciwa]

Author: cieciwa                      Date: Mon Mar 20 13:10:39 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- updated/fixed

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1420 -> 1.441.2.1421) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1420 SPECS/kernel.spec:1.441.2.1421
--- SPECS/kernel.spec:1.441.2.1420	Mon Mar 20 13:06:31 2006
+++ SPECS/kernel.spec	Mon Mar 20 14:10:33 2006
@@ -111,6 +111,7 @@
 Source32:	kernel-ia64.config
 Source33:	kernel-ia64-smp.config
 
+Source40:	kernel-netfilter.config
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.14.90.0.7
@@ -568,9 +569,6 @@
     %if %{with regparm}
 	sed -i 's:# CONFIG_REGPARM is not set:CONFIG_REGPARM=y:' $1
     %endif
-    %if %{with abi}
-    cat %{SOURCE95} >> $1
-    %endif
 %endif
 }
 
@@ -605,13 +603,8 @@
 	cat $RPM_SOURCE_DIR/kernel-$Config.config > arch/%{_target_base_arch}/defconfig
 	TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig
 
-	cat %{SOURCE80} >> arch/%{_target_base_arch}/defconfig
-
-%if %{with preemptive}
-	sed '/CONFIG_PREEMPT/d' -i arch/%{_target_base_arch}/defconfig
-	cat %{SOURCE96} >> arch/%{_target_base_arch}/defconfig
-%endif
-
+	cat %{SOURCE40} >> arch/%{_target_base_arch}/defconfig
+	
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" arch/%{_target_base_arch}/defconfig}
 %{?debug:sed -i "s:# CONFIG_DEBUG_PREEMPT is not set:CONFIG_DEBUG_PREEMPT=y:" arch/%{_target_base_arch}/defconfig}
 %{?debug:sed -i "s:# CONFIG_RT_DEADLOCK_DETECT is not set:CONFIG_RT_DEADLOCK_DETECT=y:" arch/%{_target_base_arch}/defconfig}
@@ -734,7 +727,7 @@
 
 KERNEL_BUILD_DIR=`pwd`
 echo "-%{release}" > localversion
-install -m 644 %{SOURCE50} FAQ-pl
+#install -m 644 %{SOURCE50} FAQ-pl
 
 # UP KERNEL
 KERNEL_INSTALL_DIR="$KERNEL_BUILD_DIR/build-done/kernel-UP"
@@ -1302,6 +1295,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1421  2006/03/20 13:10:33  cieciwa
+- updated/fixed
+
 Revision 1.441.2.1420  2006/03/20 12:06:31  cieciwa
 - version 2.6.16,
 - _rel 0.0,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1420&r2=1.441.2.1421&f=u