SPECS: kernel-vanilla.spec - merged from LINUX_2_6_18 - endif -> else

[shadzik]

Author: shadzik                      Date: Wed Dec  6 03:48:19 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from LINUX_2_6_18
- endif -> else

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.16 SPECS/kernel-vanilla.spec:1.17
--- SPECS/kernel-vanilla.spec:1.16	Mon Dec  4 16:50:30 2006
+++ SPECS/kernel-vanilla.spec	Wed Dec  6 04:48:14 2006
@@ -692,9 +692,18 @@
 	install arch/%{_target_base_arch}/boot/bzImage $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
 %endif
 
-%ifarch alpha
+%ifarch alpha sparc sparc64
 	gzip -cfv vmlinux > vmlinuz
+	install vmlinux $KERNEL_INSTALL_DIR/boot/vmlinux-$KernelVer
 	install vmlinuz $KERNEL_INSTALL_DIR/boot/vmlinuz-$KernelVer
+%ifarch sparc
+	elftoaout arch/sparc/boot/image -o vmlinux.aout
+	install vmlinux.aout $KERNEL_INSTALL_DIR/boot/vmlinux.aout-$KernelVer
+%endif
+%ifarch sparc64
+	elftoaout arch/sparc64/boot/image -o vmlinux.aout
+	install vmlinux.aout $KERNEL_INSTALL_DIR/boot/vmlinux.aout-$KernelVer
+%endif
 %endif
 
 %ifarch ppc
@@ -971,7 +980,7 @@
 %files
 %defattr(644,root,root,755)
 %ifarch sparc sparc64
-/boot/vmlinux-%{ver_rel}
+/boot/vmlinux.aout-%{ver_rel}
 %else
 /boot/vmlinuz-%{ver_rel}
 %endif
@@ -1077,7 +1086,7 @@
 %defattr(644,root,root,755)
 #doc FAQ-pl
 %ifarch sparc sparc64
-/boot/vmlinux-%{ver_rel}smp
+/boot/vmlinux.aout-%{ver_rel}smp
 %else
 /boot/vmlinuz-%{ver_rel}smp
 %endif
@@ -1254,6 +1263,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2006/12/06 03:48:14  shadzik
+- merged from LINUX_2_6_18
+- endif -> else
+
 Revision 1.16  2006/12/04 15:50:30  shadzik
 - make it build on sparc (abram says it doesn't work anyway on sparc64, I guess on sparc too - so fix it !)
 
================================================================

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