SPECS (LINUX_2_6): kernel.spec - use kernel-patches.config, few cosmetics

[sparky]

Author: sparky                       Date: Mon Oct 20 13:31:22 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- use kernel-patches.config, few cosmetics

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1981 -> 1.441.2.1982) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1981 SPECS/kernel.spec:1.441.2.1982
--- SPECS/kernel.spec:1.441.2.1981	Mon Oct 20 12:18:56 2008
+++ SPECS/kernel.spec	Mon Oct 20 15:31:14 2008
@@ -170,7 +170,7 @@
 Source26:	kernel-ia64.config
 
 Source40:	kernel-netfilter.config
-Source41:	kernel-squashfs.config
+Source41:	kernel-patches.config
 Source42:	kernel-tuxonice.config
 Source43:	kernel-vserver.config
 Source45:	kernel-grsec.config
@@ -248,7 +248,7 @@
 Patch50:	kernel-imq.patch
 
 # http://www.kernel.org/pub/linux/kernel/people/edward/reiser4/reiser4-for-2.6/reiser4-for-2.6.27.patch.bz2
-Patch51:       kernel-reiser4.patch
+Patch51:	kernel-reiser4.patch
 
 # http://www.zz9.dk/patches/wrr-linux-071203-2.6.25.patch.gz
 Patch52:	kernel-wrr.patch
@@ -728,8 +728,6 @@
 %{__bzip2} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
-install -m 755 %{SOURCE6} .
-
 # tuxonice:
 %if %{with tuxonice}
 ##ifarch %{ix86} %{x8664} ia64 ppc alpha
@@ -1016,10 +1014,8 @@
 	%{?debug:set -x}
 	set -e
 
-	# is this a special kernel we want to build?
-	Config="%{target_arch_dir}"
-	KernelVer=%{kernel_release}
-	echo "Building config file for %{_target_cpu} using kernel-$Config.config et al."
+	Config="kernel-%{target_arch_dir}.config"
+	echo "Building config file for %{_target_cpu} using $Config et al."
 
 	# prepare local and important options
 	cat <<-EOCONFIG > important.config
@@ -1073,15 +1069,15 @@
 		CONFIG_NFS_FS=y
 		CONFIG_ROOT_NFS=y
 %endif
-EOCONFIG
-
-	RescueConfig rescue.config
-	PaXconfig pax.config
 
 # Temporary disabled RELOCATABLE. Needed only on x86??
 %if %{with pax} || %{with grsec_full}
-	echo "CONFIG_RELOCATABLE=n" >> important.config
+		CONFIG_RELOCATABLE=n
 %endif
+EOCONFIG
+
+	RescueConfig rescue.config
+	PaXconfig pax.config
 
 	# prepare kernel-style config file from multiple config files
 	%{__awk} -v arch="all %{target_arch_dir} %{_target_base_arch} %{_target_cpu}" -f %{SOURCE6} \
@@ -1135,9 +1131,9 @@
 %endif
 %endif
 		%{SOURCE40} %{?0:netfilter} \
-		%{SOURCE41} %{?0:squashfs} \
+		%{SOURCE41} %{?0:patches} \
 		%{SOURCE20} \
-		$RPM_SOURCE_DIR/kernel-$Config.config \
+		$RPM_SOURCE_DIR/$Config \
 		> %{defconfig}
 }
 
@@ -1277,7 +1273,7 @@
 
 cp -a$l $KERNEL_BUILD_DIR/build-done/kernel/* $RPM_BUILD_ROOT
 
-if [ -e  $RPM_BUILD_ROOT/lib/modules/%{kernel_release} ] ; then
+if [ -e $RPM_BUILD_ROOT/lib/modules/%{kernel_release} ] ; then
 	rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/build
 	ln -sf %{_kernelsrcdir} $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/build
 	install -d $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/{cluster,misc}
@@ -1657,6 +1653,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1982  2008/10/20 13:31:14  sparky
+- use kernel-patches.config, few cosmetics
+
 Revision 1.441.2.1981  2008/10/20 10:18:56  pluto
 - reenable updated pf_ring patch.
 
================================================================

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