packages (Titanium): kernel-desktop/kernel-desktop.spec - ck1 patchset alre...

[shadzik]

Author: shadzik                      Date: Sun Oct 24 13:55:53 2010 GMT
Module: packages                      Tag: Titanium
---- Log message:
- ck1 patchset already includes bfs
- this implies bfs is now per default on!

---- Files affected:
packages/kernel-desktop:
   kernel-desktop.spec (1.204.2.138 -> 1.204.2.139) 

---- Diffs:

================================================================
Index: packages/kernel-desktop/kernel-desktop.spec
diff -u packages/kernel-desktop/kernel-desktop.spec:1.204.2.138 packages/kernel-desktop/kernel-desktop.spec:1.204.2.139
--- packages/kernel-desktop/kernel-desktop.spec:1.204.2.138	Sun Oct 24 15:21:50 2010
+++ packages/kernel-desktop/kernel-desktop.spec	Sun Oct 24 15:55:48 2010
@@ -35,7 +35,6 @@
 %bcond_with	laptop		# build for laptops - 100Hz
 %bcond_with	grsec_minimal	# build wihout grsec_minimal
 %bcond_with	sreadahead	# uuooaaa, be frickin' fast at boot
-%bcond_with	bfs		# Brain Fuck Scheduler - could be good only for desktops/laptops/eeePC
 %bcond_without	tuxonice	# build without tuxonice support
 %bcond_without	unionfs		# build without unionfs support
 
@@ -105,8 +104,7 @@
 Patch3:		kernel-desktop-grsec-minimal.patch
 # sreadahead - get it from http://code.google.com/p/sreadahead/source/browse/trunk/0001-kernel-trace-open.patch
 Patch4:		kernel-desktop-trace-open.patch
-# replace for cfs : http://ck.kolivas.org/patches/bfs/ see bfs-faq.txt
-Patch5:		kernel-desktop-sched-bfs.patch
+Patch5:		bfs357-worker_fix.patch
 
 #### End patches ##
 URL:		http://www.kernel.org/
@@ -434,11 +432,10 @@
 %if %{with sreadahead}
 %patch4 -p1
 %endif
-# bfs
-%if %{with bfs}
-%patch5 -p1
-%endif
+# Con Kolivas patchset
 %{__bzip2} -dc %{SOURCE101} | patch -p1 -s
+# fix worker for CK1
+%patch5 -p1
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{_postver}-%{alt_kernel}#g' Makefile
@@ -532,9 +529,7 @@
 echo "CONFIG_OPEN_TRACER=y" >> %{defconfig}
 %endif
 
-%if %{with bfs}
 echo "CONFIG_SCHED_BFS=y" >> %{defconfig}
-%endif
 }
 
 BuildKernel() {
@@ -973,6 +968,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.204.2.139  2010/10/24 13:55:48  shadzik
+- ck1 patchset already includes bfs
+- this implies bfs is now per default on!
+
 Revision 1.204.2.138  2010/10/24 13:21:50  shadzik
 - add Con Kolivas patchset, rel up
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-desktop/kernel-desktop.spec?r1=1.204.2.138&r2=1.204.2.139&f=u