SPECS (LINUX_2_6): kernel.spec - disable pcmcia for amd64 xen0
arekm
arekm at pld-linux.org
Sat Jul 30 23:07:01 CEST 2005
Author: arekm Date: Sat Jul 30 21:07:01 2005 GMT
Module: SPECS Tag: LINUX_2_6
---- Log message:
- disable pcmcia for amd64 xen0
---- Files affected:
SPECS:
kernel.spec (1.441.2.1143 -> 1.441.2.1144)
---- Diffs:
================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1143 SPECS/kernel.spec:1.441.2.1144
--- SPECS/kernel.spec:1.441.2.1143 Sat Jul 30 21:36:27 2005
+++ SPECS/kernel.spec Sat Jul 30 23:06:55 2005
@@ -8,6 +8,7 @@
%bcond_without smp # don't build SMP kernel
%bcond_without up # don't build UP kernel
%bcond_without source # don't build kernel-source package
+%bcond_without pcmcia # don't build pcmcia
%bcond_with grsecurity # enable grsecurity
%bcond_with pax # enable PaX (depends on grsecurity)
%bcond_with omosix # enable openMosix (conflicts with grsecurity/vserver)
@@ -24,6 +25,12 @@
%define with_xen 1
%endif
+%ifarch %{x8664}
+%if %{with xendev} && %{with xen0}
+%undefine with_pcmcia
+%endif
+%endif
+
%if %{with xendev} && %{without xen}
cannot build xendev kernel without xen0/xenU
%endif
@@ -1213,6 +1220,7 @@
%dir /lib/modules/%{version}-%{release}/kernel/sound
/lib/modules/%{version}-%{release}/kernel/sound/soundcore.*
%dir /lib/modules/%{version}-%{release}/misc
+%if %{with pcmcia}
%ifnarch sparc sparc64
#pcmcia stuff
%exclude /lib/modules/%{version}-%{release}/kernel/drivers/pcmcia
@@ -1222,6 +1230,7 @@
%exclude /lib/modules/%{version}-%{release}/kernel/drivers/parport/parport_cs.ko*
%exclude /lib/modules/%{version}-%{release}/kernel/drivers/serial/serial_cs.ko*
%endif
+%endif
%ifnarch sparc sparc64
#drm stuff
%exclude /lib/modules/%{version}-%{release}/kernel/drivers/char/drm
@@ -1235,6 +1244,7 @@
/lib/modules/%{version}-%{release}/kernel/drivers/char/drm
%endif
+%if %{with pcmcia}
%ifnarch sparc sparc64
%files pcmcia
%defattr(644,root,root,755)
@@ -1245,6 +1255,7 @@
/lib/modules/%{version}-%{release}/kernel/drivers/parport/parport_cs.ko*
/lib/modules/%{version}-%{release}/kernel/drivers/serial/serial_cs.ko*
%endif
+%endif
%files sound-alsa
%defattr(644,root,root,755)
@@ -1292,6 +1303,7 @@
%dir /lib/modules/%{version}-%{release}smp/kernel/sound
/lib/modules/%{version}-%{release}smp/kernel/sound/soundcore.*
%dir /lib/modules/%{version}-%{release}smp/misc
+%if %{with pcmcia}
%ifnarch sparc sparc64
#pcmcia stuff
%exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/pcmcia
@@ -1301,6 +1313,7 @@
%exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/parport/parport_cs.ko*
%exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/serial/serial_cs.ko*
%endif
+%endif
%ifnarch sparc sparc64
#drm stuff
%exclude /lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
@@ -1314,6 +1327,7 @@
/lib/modules/%{version}-%{release}smp/kernel/drivers/char/drm
%endif
+%if %{with pcmcia}
%ifnarch sparc sparc64
%files smp-pcmcia
%defattr(644,root,root,755)
@@ -1324,6 +1338,7 @@
/lib/modules/%{version}-%{release}smp/kernel/drivers/parport/parport_cs.ko*
/lib/modules/%{version}-%{release}smp/kernel/drivers/serial/serial_cs.ko*
%endif
+%endif
%files smp-sound-alsa
%defattr(644,root,root,755)
@@ -1419,6 +1434,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.441.2.1144 2005/07/30 21:06:55 arekm
+- disable pcmcia for amd64 xen0
+
Revision 1.441.2.1143 2005/07/30 19:36:27 arekm
- add xen fixes patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1143&r2=1.441.2.1144&f=u
More information about the pld-cvs-commit
mailing list