SPECS: kernel-vanilla.spec - sparc64 support (hope I didn't break ...

[shadzik]

Author: shadzik                      Date: Sat Dec  2 17:31:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sparc64 support (hope I didn't break other archs)

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.9 SPECS/kernel-vanilla.spec:1.10
--- SPECS/kernel-vanilla.spec:1.9	Thu Nov 30 01:03:19 2006
+++ SPECS/kernel-vanilla.spec	Sat Dec  2 18:31:00 2006
@@ -21,6 +21,12 @@
 %define		have_isa	0
 %endif
 
+%ifarch sparc64
+%define		have_pcmcia	0
+%else
+%define		have_pcmcia	1
+%endif
+
 ## Program required by kernel to work.
 %define		_binutils_ver		2.12.1
 %define		_util_linux_ver		2.10o
@@ -75,6 +81,8 @@
 Source26:	kernel-vanilla-ppc-smp.config
 Source27:	kernel-vanilla-alpha.config
 Source28:	kernel-vanilla-alpha-smp.config
+Source29:	kernel-vanilla-sparc64.config
+Source30:	kernel-vanilla-sparc64-smp.config
 
 Source40:	kernel-vanilla-preempt-nort.config
 Source41:	kernel-vanilla-no-preempt-nort.config
@@ -114,7 +122,7 @@
 Conflicts:	udev < %{_udev_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
-ExclusiveArch:	%{ix86} alpha %{x8664} ppc
+ExclusiveArch:	%{ix86} alpha %{x8664} ppc sparc64
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -128,6 +136,13 @@
 	%define	MakeOpts %{CommonOpts} ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
 	%define	DepMod /bin/true
 
+	%if "%{_arch}" == "sparc" && "%{_target_base_arch}" == "sparc64"
+	%undefine CommonOpts
+	%define MakeOpts ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux-
+	%define	DepMod /sbin/depmod
+	%endif
+
+
 	%if "%{_arch}" == "x86_64" && "%{_target_base_arch}" == "i386"
 	%define	MakeOpts %{CommonOpts} CC="%{__cc}" ARCH=%{_target_base_arch}
 	%define	DepMod /sbin/depmod
@@ -590,7 +605,7 @@
 	echo "Building config file [using $Config.conf] for KERNEL $1..."
 
 	echo "" > .config
-	%ifnarch alpha
+	%ifnarch alpha sparc64
 	cat %{SOURCE20} > .config
 	%endif
 	cat $RPM_SOURCE_DIR/kernel-vanilla-$Config.config >> .config
@@ -633,9 +648,21 @@
 	%{__make} %{MakeOpts} include/linux/version.h \
 		%{?with_verbose:V=1}
 
+#%ifarch sparc sparc64
+%ifarch sparc64
+	%{__make} %{MakeOpts} image \
+		%{?with_verbose:V=1}
 
+	%{__make} %{MakeOpts} modules \
+		%{?with_verbose:V=1}
+#%else
+#	sparc32 %{__make} \
+#		%{?with_verbose:V=1}
+#%endif
+%else
 	%{__make} %{MakeOpts} \
 		%{?with_verbose:V=1}
+%endif
 }
 
 PreInstallKernel() {
@@ -934,7 +961,11 @@
 %if %{with up}
 %files
 %defattr(644,root,root,755)
+%ifnarch sparc64
 /boot/vmlinuz-%{ver_rel}
+%else
+/boot/vmlinux-%{ver_rel}
+%endif
 /boot/System.map-%{ver_rel}
 %ghost /boot/initrd-%{ver_rel}.gz
 %dir /lib/modules/%{ver_rel}
@@ -955,6 +986,7 @@
 /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
 %dir /lib/modules/%{ver_rel}/misc
+%if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/pcmcia
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/*/pcmcia
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/bluetooth/*_cs.ko*
@@ -966,6 +998,7 @@
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/serial/serial_cs.ko*
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/telephony/ixj_pcmcia.ko*
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/usb/host/sl811_cs.ko*
+%endif
 /lib/modules/%{ver_rel}/build
 %ghost /lib/modules/%{ver_rel}/modules.*
 %dir %{_sysconfdir}/modprobe.d/%{ver_rel}
@@ -978,6 +1011,7 @@
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/drivers/char/drm
 
+%if %{have_pcmcia}
 %files pcmcia
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/drivers/pcmcia
@@ -992,6 +1026,7 @@
 /lib/modules/%{ver_rel}/kernel/drivers/telephony/ixj_pcmcia.ko*
 /lib/modules/%{ver_rel}/kernel/drivers/usb/host/sl811_cs.ko*
 /lib/modules/%{ver_rel}/kernel/sound/pcmcia
+%endif
 
 %files sound-alsa
 %defattr(644,root,root,755)
@@ -1000,7 +1035,9 @@
 %exclude %dir /lib/modules/%{ver_rel}/kernel/sound
 %exclude /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
 %exclude /lib/modules/%{ver_rel}/kernel/sound/oss
+%if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}/kernel/sound/pcmcia
+%endif
 
 %files sound-oss
 %defattr(644,root,root,755)
@@ -1166,6 +1203,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/12/02 17:31:00  shadzik
+- sparc64 support (hope I didn't break other archs)
+
 Revision 1.9  2006/11/30 00:03:19  shadzik
 - linux-2.6.18.4
 
================================================================

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