Author: sparky Date: Fri Jun 23 22:56:15 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- cleaned bconds: preemptrt of by default, pcmcia and test_build are useless
---- Files affected:
SPECS:
kernel-desktop.spec (1.32 -> 1.33)
---- Diffs:
================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.32 SPECS/kernel-desktop.spec:1.33
--- SPECS/kernel-desktop.spec:1.32 Sat Jun 24 00:50:46 2006
+++ SPECS/kernel-desktop.spec Sat Jun 24 00:56:10 2006
@@ -4,24 +4,16 @@
%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_without preemptrt # don't build preemptive kernel
+%bcond_with preemptrt # use realtime-preempt patch
%bcond_without ck # don't use Con Kolivas patchset
%bcond_without grsec_minimal # don't build grsecurity (minimal subset:
proc,link,fifo,shm)
%bcond_with bootsplash # build with bootsplash instead of fbsplash
%bcond_with laptop # build with HZ=100
%bcond_with verbose # verbose build (V=1)
-%bcond_with test_build # don't patch with preemptrt nor any patch
depending no it
%{?debug:%define with_verbose 1}
-%if %{with test_build}
-%undefine with_preemptrt
-%undefine with_suspend2
-%undefine with_grsec_minimal
-%endif
-
%ifarch %{ix86} ppc
%define have_isa 1
%else
@@ -1178,7 +1170,6 @@
%dir /lib/modules/%{ver_rel}/kernel/sound
/lib/modules/%{ver_rel}/kernel/sound/soundcore.*
%dir /lib/modules/%{ver_rel}/misc
-%if %{with 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*
@@ -1190,7 +1181,6 @@
%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}
@@ -1208,7 +1198,6 @@
/lib/modules/%{ver_rel}/kernel/net/netfilter
/lib/modules/%{ver_rel}/kernel/net/*/netfilter
-%if %{with pcmcia}
%files pcmcia
%defattr(644,root,root,755)
/lib/modules/%{ver_rel}/kernel/drivers/pcmcia
@@ -1222,7 +1211,6 @@
/lib/modules/%{ver_rel}/kernel/drivers/serial/serial_cs.ko*
/lib/modules/%{ver_rel}/kernel/drivers/telephony/ixj_pcmcia.ko*
/lib/modules/%{ver_rel}/kernel/drivers/usb/host/sl811_cs.ko*
-%endif
%files sound-alsa
%defattr(644,root,root,755)
@@ -1265,7 +1253,6 @@
%dir /lib/modules/%{ver_rel}smp/kernel/sound
/lib/modules/%{ver_rel}smp/kernel/sound/soundcore.*
%dir /lib/modules/%{ver_rel}smp/misc
-%if %{with pcmcia}
%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/pcmcia
%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/*/pcmcia
%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/bluetooth/*_cs.ko*
@@ -1277,7 +1264,6 @@
%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/serial/serial_cs.ko*
%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/telephony/ixj_pcmcia.ko*
%exclude /lib/modules/%{ver_rel}smp/kernel/drivers/usb/host/sl811_cs.ko*
-%endif
/lib/modules/%{ver_rel}smp/build
%ghost /lib/modules/%{ver_rel}smp/modules.*
%dir %{_sysconfdir}/modprobe.d/%{ver_rel}smp
@@ -1295,7 +1281,6 @@
/lib/modules/%{ver_rel}smp/kernel/net/netfilter
/lib/modules/%{ver_rel}smp/kernel/net/*/netfilter
-%if %{with pcmcia}
%files smp-pcmcia
%defattr(644,root,root,755)
/lib/modules/%{ver_rel}smp/kernel/drivers/pcmcia
@@ -1309,7 +1294,6 @@
/lib/modules/%{ver_rel}smp/kernel/drivers/serial/serial_cs.ko*
/lib/modules/%{ver_rel}smp/kernel/drivers/telephony/ixj_pcmcia.ko*
/lib/modules/%{ver_rel}smp/kernel/drivers/usb/host/sl811_cs.ko*
-%endif
%files smp-sound-alsa
%defattr(644,root,root,755)
@@ -1405,6 +1389,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.33 2006/06/23 22:56:10 sparky
+- cleaned bconds: preemptrt of by default, pcmcia and test_build are useless
+
Revision 1.32 2006/06/23 22:50:46 sparky
- epoch 3, for sync with kernel.spec
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/kernel-desktop.spec?r1=1.32&r2=1.33&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
