SPECS: kernel-vanilla.spec - make it build on sparc (abram says it...

[shadzik]

Author: shadzik                      Date: Mon Dec  4 15:50:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- make it build on sparc (abram says it doesn't work anyway on sparc64, I guess on sparc too - so fix it !)

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

---- Diffs:

================================================================
Index: SPECS/kernel-vanilla.spec
diff -u SPECS/kernel-vanilla.spec:1.15 SPECS/kernel-vanilla.spec:1.16
--- SPECS/kernel-vanilla.spec:1.15	Mon Dec  4 01:17:32 2006
+++ SPECS/kernel-vanilla.spec	Mon Dec  4 16:50:30 2006
@@ -23,15 +23,13 @@
 
 %ifarch sparc sparc64
 %define		have_pcmcia	0
+%define		have_oss	0
 %else
 %define		have_pcmcia	1
+%define		have_oss	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
@@ -987,7 +985,7 @@
 %ifnarch sparc
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/char/drm
 %endif
-%if %{have_isa}
+%if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
 /lib/modules/%{ver_rel}/kernel/fs
@@ -998,8 +996,10 @@
 %dir /lib/modules/%{ver_rel}/kernel/sound
 /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
 %if %{have_sound}
+%ifnarch sparc
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
 %endif
+%endif
 %dir /lib/modules/%{ver_rel}/misc
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}/kernel/drivers/pcmcia
@@ -1049,20 +1049,26 @@
 %files sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/sound
+%ifnarch sparc
 /lib/modules/%{ver_rel}/kernel/drivers/media/video/*/*-alsa.ko*
+%endif
 %exclude %dir /lib/modules/%{ver_rel}/kernel/sound
 %exclude /lib/modules/%{ver_rel}/kernel/sound/soundcore.*
+%if %{have_oss}
 %exclude /lib/modules/%{ver_rel}/kernel/sound/oss
+%endif
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}/kernel/sound/pcmcia
 %endif
 
+%if %{have_oss}
 %files sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}/kernel/sound/oss
 %if %{have_isa}
 /lib/modules/%{ver_rel}/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
+%endif			# %{have_oss}
 %endif			# %{have_sound}
 %endif			# %%{with up}
 
@@ -1085,7 +1091,7 @@
 %ifnarch sparc
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/char/drm
 %endif
-%if %{have_isa}
+%if %{have_oss} && %{have_isa}
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
 /lib/modules/%{ver_rel}smp/kernel/fs
@@ -1096,8 +1102,10 @@
 %dir /lib/modules/%{ver_rel}smp/kernel/sound
 /lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
 %if %{have_sound}
+%ifnarch sparc
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/media/video/*/*-alsa.ko*
 %endif
+%endif
 %dir /lib/modules/%{ver_rel}smp/misc
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}smp/kernel/drivers/pcmcia
@@ -1147,20 +1155,26 @@
 %files smp-sound-alsa
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/sound
+%ifnarch sparc
 /lib/modules/%{ver_rel}smp/kernel/drivers/media/video/*/*-alsa.ko*
+%endif
 %exclude %dir /lib/modules/%{ver_rel}smp/kernel/sound
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
+%if %{have_oss}
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/oss
+%endif
 %if %{have_pcmcia}
 %exclude /lib/modules/%{ver_rel}smp/kernel/sound/pcmcia
 %endif
 
+%if %{have_oss}
 %files smp-sound-oss
 %defattr(644,root,root,755)
 /lib/modules/%{ver_rel}smp/kernel/sound/oss
 %if %{have_isa}
 /lib/modules/%{ver_rel}smp/kernel/drivers/media/radio/miropcm20*.ko*
 %endif
+%endif			# %{have_oss}
 %endif			# %{have_sound}
 %endif			# %{with_smp}
 
@@ -1240,6 +1254,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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 !)
+
 Revision 1.15  2006/12/04 00:17:32  shadzik
 - start playing with linux-2.6.19
 
================================================================

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