SPECS (LINUX_2_6_20): kernel.spec - rel 0.5 - mainly for ppc64 tes...

[mguevara]

Author: mguevara                     Date: Mon Mar 19 13:46:10 2007 GMT
Module: SPECS                         Tag: LINUX_2_6_20
---- Log message:
- rel 0.5 - mainly for ppc64 test build
- added kernel-powerpc.config - wich is generated for powerpc target based 
  on kernel-ppc.config - for ppc64 build
- added powerpc as supported arch
- removed linux-net-2.6.19.patch - no need for 2.6.19 network code

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1698.2.83 -> 1.441.2.1698.2.84) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1698.2.83 SPECS/kernel.spec:1.441.2.1698.2.84
--- SPECS/kernel.spec:1.441.2.1698.2.83	Mon Mar 19 10:45:25 2007
+++ SPECS/kernel.spec	Mon Mar 19 14:46:05 2007
@@ -22,7 +22,6 @@
 # - (external) truecrypt builds and works (for me)
 #
 # TODO 2.6.20.3
-# - test build 2.6.20.3
 # - test non default bconds for 2.6.20.3
 # - test build --with pax --with reiser4 for alpha
 # - test build on sparc, sparc64
@@ -147,7 +146,7 @@
 %define		_prepatch		%{nil}
 %define		_pre_rc			%{nil}
 %define		_rc			%{nil}
-%define		_rel			0.4
+%define		_rel			0.5
 
 %define		_netfilter_snap		20061213
 %define		_nf_hipac_ver		0.9.1
@@ -210,6 +209,7 @@
 Source24:	kernel-alpha.config
 Source25:	kernel-ppc.config
 Source26:	kernel-ia64.config
+Source27:	kernel-powerpc.config
 
 Source34:	kernel-abi.config
 
@@ -233,9 +233,6 @@
 #	Patches
 ###
 
-# TODO: patch not active for some time
-Patch0:		linux-net-2.6.19.patch
-#
 # TODO: not compatible - still needed?
 # PATA ports on SATA Promise controller; patch based on:
 # http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/kernel/devel/linux-2.6-sata-promise-pata-ports.patch
@@ -460,7 +457,7 @@
 %if %{with xen0} || %{with xenU}
 ExclusiveArch:	%{ix86}
 %else
-ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc ppc64 sparc sparc64 arm
+ExclusiveArch:	%{ix86} alpha %{x8664} ia64 ppc ppc64 powerpc sparc sparc64 arm
 %endif
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -780,9 +777,6 @@
 %prep
 %setup -q -n linux-%{_basever}%{_rc} %{?with_abi:-a14}
 
-# borooken in this time.
-#patch0 -p1
-
 %ifarch ppc
 install %{SOURCE5} Makefile.ppclibs
 %endif
@@ -959,7 +953,7 @@
 #
 # end of grsecurity & pax stuff
 
-%ifarch ppc ppc64
+%ifarch ppc ppc64 powerpc
 %patch200 -p1
 %endif
 
@@ -1051,7 +1045,7 @@
 		# sed -i 's:CONFIG_EFI=y:# CONFIG_EFI is not set:' $1
 
 	%endif
-	%ifarch ppc64
+	%ifarch ppc64 powerpc
 		sed -i 's:CONFIG_PAX_NOELFRELOCS=y:# CONFIG_PAX_NOELFRELOCS is not set:' $1
 	%endif
 	%ifarch ppc
@@ -1060,7 +1054,7 @@
 		sed -i 's:# CONFIG_PAX_EMUPLT is not set:CONFIG_PAX_EMUPLT=y:' $1
 	%endif
 
-	%ifarch sparc || sparc64 || alpha
+	%ifarch sparc sparc64 alpha
 		sed -i 's:# CONFIG_PAX_EMUPLT is not set:CONFIG_PAX_EMUPLT=y:' $1
 	%endif
 
@@ -1094,11 +1088,13 @@
 	cat $RPM_SOURCE_DIR/kernel-$Config.config > arch/%{_target_base_arch}/defconfig
 	TuneUpConfigForIX86 arch/%{_target_base_arch}/defconfig
 
-%ifarch ppc ppc64
+%ifarch ppc
 	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
+
+%ifarch ppc64 powerpc
+	install %{SOURCE27} arch/%{_target_base_arch}/defconfig
+	# sed -i "s:# CONFIG_PPC64 is not set:CONFIG_PPC64=y:" arch/%{_target_base_arch}/defconfig
 %endif
 
 # netfilter
@@ -1112,7 +1108,7 @@
 	cat %{SOURCE42} >> arch/%{_target_base_arch}/defconfig
 %endif
 
-%ifarch ppc ppc64
+%ifarch ppc ppc64 powerpc
 	sed -i "s:CONFIG_SUSPEND2=y:# CONFIG_SUSPEND2 is not set:" arch/%{_target_base_arch}/defconfig
 %endif
 %if %{with vserver}
@@ -1268,7 +1264,7 @@
 	install vmlinux.aout $KERNEL_INSTALL_DIR/boot/vmlinux.aout-$KernelVer
 %endif
 %endif
-%ifarch ppc ppc64
+%ifarch ppc ppc64 powerpc
 	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
 	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
 %endif
@@ -1524,7 +1520,7 @@
 %ghost /lib/modules/%{kernel_release}/modules.*
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
-%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
+%ifarch alpha %{ix86} %{x8664} ppc ppc64 powerpc sparc sparc64
 %files vmlinux
 %defattr(644,root,root,755)
 /boot/vmlinux-%{kernel_release}
@@ -1678,6 +1674,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1698.2.84  2007/03/19 13:46:05  mguevara
+- rel 0.5 - mainly for ppc64 test build
+- added kernel-powerpc.config - wich is generated for powerpc target based
+  on kernel-ppc.config - for ppc64 build
+- added powerpc as supported arch
+- removed linux-net-2.6.19.patch - no need for 2.6.19 network code
+
 Revision 1.441.2.1698.2.83  2007/03/19 09:45:25  mguevara
 - rel 0.4, pax-linux-2.6.20.patch updated to test9
 
================================================================

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