SPECS: kernel-vanilla.spec - add sparc32 support

Mon Dec 4 01:00:06 CET 2006

Author: shadzik                      Date: Mon Dec  4 00:00:06 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add sparc32 support

---- Files affected:
SPECS:
   kernel-vanilla.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.12 SPECS/kernel-vanilla.spec:1.13

--- SPECS/kernel-vanilla.spec:1.12	Sat Dec  2 19:15:44 2006
+++ SPECS/kernel-vanilla.spec	Mon Dec  4 01:00:00 2006
@@ -21,12 +21,18 @@
 %define		have_isa	0
 %endif
 
-%ifarch sparc64
+%ifarch sparc sparc64
 %define		have_pcmcia	0
 %else
 %define		have_pcmcia	1
 %endif
 
+%ifarch sparc
+%define		have_sound	0
+%else
+%define		have_sound	1
+%endif
+
 ## Program required by kernel to work.
 %define		_binutils_ver		2.12.1
 %define		_util_linux_ver		2.10o
@@ -83,6 +89,8 @@
 Source28:	kernel-vanilla-alpha-smp.config
 Source29:	kernel-vanilla-sparc64.config
 Source30:	kernel-vanilla-sparc64-smp.config
+Source31:	kernel-vanilla-sparc.config
+Source32:	kernel-vanilla-sparc-smp.config
 
 Source40:	kernel-vanilla-preempt-nort.config
 Source41:	kernel-vanilla-no-preempt-nort.config
@@ -125,7 +133,7 @@
 Conflicts:	udev < %{_udev_ver}
 Conflicts:	util-linux < %{_util_linux_ver}
 Conflicts:	xfsprogs < %{_xfsprogs_ver}
-ExclusiveArch:	%{ix86} alpha %{x8664} ppc sparc64
+ExclusiveArch:	%{ix86} alpha %{x8664} ppc sparc sparc64
 ExclusiveOS:	Linux
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -608,7 +616,7 @@
 	echo "Building config file [using $Config.conf] for KERNEL $1..."
 
 	echo "" > .config
-	%ifnarch alpha sparc64
+	%ifnarch alpha sparc sparc64
 	cat %{SOURCE20} > .config
 	%endif
 	cat $RPM_SOURCE_DIR/kernel-vanilla-$Config.config >> .config
@@ -651,17 +659,17 @@
 	%{__make} %{MakeOpts} include/linux/version.h \
 		%{?with_verbose:V=1}
 
-#%ifarch sparc sparc64
+%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
+	sparc %{__make} \
+		%{?with_verbose:V=1}
+%endif
 %else
 	%{__make} %{MakeOpts} \
 		%{?with_verbose:V=1}
@@ -964,7 +972,7 @@
 %if %{with up}
 %files
 %defattr(644,root,root,755)
-%ifarch sparc64
+%ifarch sparc sparc64
 /boot/vmlinux-%{ver_rel}
 %else
 /boot/vmlinuz-%{ver_rel}
@@ -976,7 +984,9 @@
 /lib/modules/%{ver_rel}/kernel/arch
 /lib/modules/%{ver_rel}/kernel/crypto
 /lib/modules/%{ver_rel}/kernel/drivers
+%ifnarch sparc
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/char/drm
+%endif
 %if %{have_isa}
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
@@ -987,7 +997,9 @@
 /lib/modules/%{ver_rel}/kernel/security
 %dir /lib/modules/%{ver_rel}/kernel/sound
 /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
+%if %{have_sound}
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
+%endif
 %dir /lib/modules/%{ver_rel}/misc
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/pcmcia
@@ -1010,9 +1022,11 @@
 %defattr(644,root,root,755)
 /boot/vmlinux-%{ver_rel}
 
+%ifnarch sparc
 %files drm
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/drivers/char/drm
+%endif
 
 %if %{have_pcmcia}
 %files pcmcia
@@ -1031,6 +1045,7 @@
 /lib/modules/%{ver_rel}/kernel/sound/pcmcia
 %endif
 
+%if %{have_sound}
 %files sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/sound
@@ -1048,13 +1063,14 @@
 %if %{have_isa}
 /lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
+%endif			# %{have_sound}
 %endif			# %%{with up}
 
 %if %{with smp}
 %files smp
 %defattr(644,root,root,755)
 #doc FAQ-pl
-%ifarch sparc64
+%ifarch sparc sparc64
 /boot/vmlinux-%{ver_rel}smp
 %else
 /boot/vmlinuz-%{ver_rel}smp
@@ -1066,7 +1082,9 @@
 /lib/modules/%{ver_rel}smp/kernel/arch
 /lib/modules/%{ver_rel}smp/kernel/crypto
 /lib/modules/%{ver_rel}smp/kernel/drivers
+%ifnarch sparc
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/char/drm
+%endif
 %if %{have_isa}
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
@@ -1077,7 +1095,9 @@
 /lib/modules/%{ver_rel}smp/kernel/security
 %dir /lib/modules/%{ver_rel}smp/kernel/sound
 /lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
+%if %{have_sound}
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/video/*/*-alsa.ko*
+%endif
 %dir /lib/modules/%{ver_rel}smp/misc
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/pcmcia
@@ -1100,9 +1120,11 @@
 %defattr(644,root,root,755)
 /boot/vmlinux-%{ver_rel}smp
 
+%ifnarch sparc
 %files smp-drm
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/drivers/char/drm
+%endif
 
 %if %{have_pcmcia}
 %files smp-pcmcia
@@ -1121,6 +1143,7 @@
 /lib/modules/%{ver_rel}smp/kernel/sound/pcmcia
 %endif
 
+%if %{have_sound}
 %files smp-sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/sound
@@ -1138,7 +1161,8 @@
 %if %{have_isa}
 /lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
-%endif			# %%{with smp}
+%endif			# %{have_sound}
+%endif			# %{with_smp}
 
 %files headers
 %defattr(644,root,root,755)
@@ -1216,6 +1240,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2006/12/04 00:00:00  shadzik
+- add sparc32 support
+
 Revision 1.12  2006/12/02 18:15:44  shadzik
 - add sparc64 BR
 - cosmetics
================================================================

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

