SPECS: kernel-desktop.spec - (re)organised .config creating

[sparky]

Author: sparky                       Date: Mon Jun 12 22:55:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- (re)organised .config creating

---- Files affected:
SPECS:
   kernel-desktop.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.15 SPECS/kernel-desktop.spec:1.16
--- SPECS/kernel-desktop.spec:1.15	Mon Jun 12 19:05:30 2006
+++ SPECS/kernel-desktop.spec	Tue Jun 13 00:55:23 2006
@@ -81,21 +81,21 @@
 Source1:	kernel-autoconf.h
 Source2:	kernel-config.h
 
-Source20:	kernel-i386.config
-Source21:	kernel-i386-smp.config
-Source22:	kernel-x86_64.config
-Source23:	kernel-x86_64-smp.config
-Source30:	kernel-ppc.config
-Source31:	kernel-ppc-smp.config
+Source20:	kernel-desktop-common.config
+Source21:	kernel-desktop-i386.config
+Source22:	kernel-desktop-i386-smp.config
+Source23:	kernel-desktop-x86_64.config
+Source24:	kernel-desktop-x86_64-smp.config
+Source25:	kernel-desktop-ppc.config
+Source26:	kernel-desktop-ppc-smp.config
 
 Source40:	kernel-desktop-preempt-common.config
 Source41:	kernel-desktop-preempt-rt.config
 Source42:	kernel-desktop-preempt-nopreempt.config
 Source43:	kernel-suspend2.config
-Source44:	kernel-vesafb-tng.config
-Source45:	kernel-squashfs.config
-Source46:	kernel-netfilter.config
-Source47:	kernel-grsec.config
+Source44:	kernel-desktop-patches.config
+Source45:	kernel-desktop-netfilter.config
+Source46:	kernel-grsec.config
 
 ###
 #	Patches
@@ -765,12 +765,12 @@
 	KernelVer=%{ver_rel}$1
 
 	echo "Building config file [using $Config.conf] for KERNEL $1..."
-	cat $RPM_SOURCE_DIR/kernel-$Config.config > arch/%{_target_base_arch}/defconfig
+	cat %{SOURCE20} > arch/%{_target_base_arch}/defconfig
+	cat $RPM_SOURCE_DIR/kernel-desktop-$Config.config >> arch/%{_target_base_arch}/defconfig
 
 	TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig
 
 	# preempt
-	sed -i '/CONFIG_PREEMPT/d' arch/%{_target_base_arch}/defconfig
 	cat %{SOURCE40} >> arch/%{_target_base_arch}/defconfig
 %if %{with preemptrt}	
 	cat %{SOURCE41} >> arch/%{_target_base_arch}/defconfig
@@ -782,20 +782,14 @@
 	cat %{SOURCE43} >> arch/%{_target_base_arch}/defconfig
 %endif
 
-	# fbsplash
-	echo "CONFIG_FB_SPLASH=y" >> arch/%{_target_base_arch}/defconfig
-
-	# vesafb-tng
+	# fbsplash, vesafb-tng, squashfs, imq, tahoe, atm, reiser4
 	cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
 
-	# squashfs
-	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
-
 	# netfilter
-	cat %{SOURCE46} >> arch/%{_target_base_arch}/defconfig
+	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
 
 %if %{with grsec_minimal}
-	cat %{SOURCE47} >> arch/%{_target_base_arch}/defconfig
+	cat %{SOURCE46} >> arch/%{_target_base_arch}/defconfig
 %endif
 
 %{?debug:sed -i "s:# CONFIG_DEBUG_SLAB is not set:CONFIG_DEBUG_SLAB=y:" arch/%{_target_base_arch}/defconfig}
@@ -1371,6 +1365,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2006/06/12 22:55:23  sparky
+- (re)organised .config creating
+
 Revision 1.15  2006/06/12 17:05:30  sparky
 - apply netfilter patches
 
================================================================

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