SPECS: kernel-xen.spec - misc fixes from kernel-vanilla

[glen]

Author: glen                         Date: Sat Apr 26 21:27:28 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- misc fixes from kernel-vanilla

---- Files affected:
SPECS:
   kernel-xen.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/kernel-xen.spec
diff -u SPECS/kernel-xen.spec:1.6 SPECS/kernel-xen.spec:1.7
--- SPECS/kernel-xen.spec:1.6	Sat Apr 26 19:53:14 2008
+++ SPECS/kernel-xen.spec	Sat Apr 26 23:27:23 2008
@@ -24,6 +24,7 @@
 %define		have_pcmcia	1
 %define		have_oss	1
 %define		have_sound	1
+%define		have_drm	0
 
 %define		xen_version		3.2.0
 
@@ -505,7 +506,7 @@
 ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz-%{alt_kernel}
 ln -sf System.map-%{kernel_release} /boot/System.map-%{alt_kernel}
 if [ ! -e /boot/vmlinuz ]; then
-	ln -sf vmlinuz-%{kernel_release} /boot/vmlinuz
+	ln -sf vmlinuz-%{alt_kernel} /boot/vmlinuz
 	ln -sf System.map-%{alt_kernel} /boot/System.map
 	ln -sf initrd-%{alt_kernel} %{initrd_dir}/initrd
 fi
@@ -588,9 +589,9 @@
 /lib/modules/%{kernel_release}/kernel/arch
 /lib/modules/%{kernel_release}/kernel/crypto
 /lib/modules/%{kernel_release}/kernel/drivers
-#%if %{have_oss} && %{have_isa}
-#%exclude /lib/modules/%{kernel_release}/kernel/drivers/media/radio/miropcm20*.ko*
-#%endif
+%if %{have_drm}
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/char/drm
+%endif
 /lib/modules/%{kernel_release}/kernel/fs
 /lib/modules/%{kernel_release}/kernel/kernel
 /lib/modules/%{kernel_release}/kernel/lib
@@ -617,9 +618,17 @@
 %ghost /lib/modules/%{kernel_release}/source
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
+%ifarch alpha %{ix86} %{x8664} ppc ppc64 sparc sparc64
 %files vmlinux
 %defattr(644,root,root,755)
 /boot/vmlinux-%{kernel_release}
+%endif
+
+%if %{have_drm}
+%files drm
+%defattr(644,root,root,755)
+/lib/modules/%{kernel_release}/kernel/drivers/char/drm
+%endif
 
 %if %{have_pcmcia}
 %files pcmcia
@@ -685,6 +694,7 @@
 
 %files doc
 %defattr(644,root,root,755)
+%dir %{_kernelsrcdir}
 %{_kernelsrcdir}/Documentation
 
 %if %{with source}
@@ -733,6 +743,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2008-04-26 21:27:23  glen
+- misc fixes from kernel-vanilla
+
 Revision 1.6  2008-04-26 17:53:14  glen
 - triggers for {build,source} symlinks
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kernel-xen.spec?r1=1.6&r2=1.7&f=u