SPECS (LINUX_2_6_20): kernel.spec - cleanups, release 0.3.

[pluto]

Author: pluto                        Date: Fri Mar 16 11:29:15 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_20
---- Log message:
- cleanups, release 0.3.

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1698.2.81 -> 1.441.2.1698.2.82) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.81 SPECS/kernel.spec:1.441.2.1698.2.82
--- SPECS/kernel.spec:1.441.2.1698.2.81	Fri Mar 16 11:05:11 2007
+++ SPECS/kernel.spec	Fri Mar 16 12:29:10 2007
@@ -147,7 +147,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.2
+%define		_rel			0.3
 
 %define		_netfilter_snap		20061213
 %define		_nf_hipac_ver		0.9.1
@@ -204,19 +204,13 @@
 # Source14-md5:	f2563a2d748c7480559e8d3ff77eb18a
 
 Source20:	kernel-i386.config
-Source21:	kernel-i386-smp.config
-Source22:	kernel-x86_64.config
-Source23:	kernel-x86_64-smp.config
-Source24:	kernel-sparc.config
-Source25:	kernel-sparc-smp.config
-Source26:	kernel-sparc64.config
-Source27:	kernel-sparc64-smp.config
-Source28:	kernel-alpha.config
-Source29:	kernel-alpha-smp.config
-Source30:	kernel-ppc.config
-Source31:	kernel-ppc-smp.config
-Source32:	kernel-ia64.config
-Source33:	kernel-ia64-smp.config
+Source21:	kernel-x86_64.config
+Source22:	kernel-sparc.config
+Source23:	kernel-sparc64.config
+Source24:	kernel-alpha.config
+Source25:	kernel-ppc.config
+Source26:	kernel-ia64.config
+
 Source34:	kernel-abi.config
 
 Source40:	kernel-netfilter.config
@@ -1093,23 +1087,18 @@
 BuildConfig() {
 	%{?debug:set -x}
 	# is this a special kernel we want to build?
-	Config="%{_target_base_arch}-smp"
+	Config="%{_target_base_arch}"
 	KernelVer=%{kernel_release}
 	echo "Building config file using $Config.conf..."
 	cat $RPM_SOURCE_DIR/kernel-$Config.config > arch/%{_target_base_arch}/defconfig
 	TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig
 
 %ifarch ppc ppc64
-	if [ "$smp" = "yes" ]; then
-		install %{SOURCE31} arch/%{_target_base_arch}/defconfig
-	else
-		install %{SOURCE30} arch/%{_target_base_arch}/defconfig
-	fi
-%endif
-
+	install %{SOURCE25} arch/%{_target_base_arch}/defconfig
 %ifarch ppc64
 	sed -i "s:# CONFIG_PPC64 is not set:CONFIG_PPC64=y:" arch/%{_target_base_arch}/defconfig
 %endif
+%endif
 
 # netfilter
 	cat %{SOURCE40} >> arch/%{_target_base_arch}/defconfig
@@ -1256,7 +1245,7 @@
 }
 
 PreInstallKernel() {
-	Config="%{_target_base_arch}-smp"
+	Config="%{_target_base_arch}"
 	KernelVer=%{kernel_release}
 
 	mkdir -p $KERNEL_INSTALL_DIR/boot
@@ -1384,6 +1373,9 @@
 # collect module-build files and directories
 perl %{SOURCE7} %{_kernelsrcdir} $KERNEL_BUILD_DIR
 
+# ghosted initrd
+touch $RPM_BUILD_ROOT/boot/initrd-%{kernel_release}.gz
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -1685,6 +1677,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1698.2.82  2007/03/16 11:29:10  pluto
+- cleanups, release 0.3.
+
 Revision 1.441.2.1698.2.81  2007/03/16 10:05:11  pluto
 - merge up/smp kernel infrastructure. th will use only smp.
 
================================================================

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