SPECS: kernel-desktop.spec - netfilter todo entry done - apply Jen...

[adamg]

Author: adamg                        Date: Sun Aug 19 11:01:48 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- netfilter todo entry done
- apply Jens Axboe's fcache patch unconditionally (not part of ck)
- nock-compat patch no longer needed (was related to fcache patch which
  we apply unconditionally now)
- fbsplash updated wrt fcache patch
- preemptrt updated - applies, but conflicts with other patches

---- Files affected:
SPECS:
   kernel-desktop.spec (1.109 -> 1.110) 

---- Diffs:

================================================================
Index: SPECS/kernel-desktop.spec
diff -u SPECS/kernel-desktop.spec:1.109 SPECS/kernel-desktop.spec:1.110
--- SPECS/kernel-desktop.spec:1.109	Sat Aug 18 22:35:02 2007
+++ SPECS/kernel-desktop.spec	Sun Aug 19 13:01:43 2007
@@ -6,7 +6,6 @@
 # - investigate hdaps_protect -- doesn't apply
 # - patch85 -- wtf?
 # - check patches > 90
-# - update netfilter
 # - compare to kernel.spec and add any needed/missing patches
 # - put together a default .config that makes sense for desktops
 # - convert patches to common diff -uNp format
@@ -123,11 +122,13 @@
 
 Patch0:		kernel-desktop-preempt-rt.patch
 
-# Con Kolivas patchset
-# - fcache patch is proabely not a part of -ck anymore
+# Jens Axboe's fcache patch (for ext3 only)
+# http://git.kernel.dk/?p=linux-2.6-block.git;a=commitdiff;h=118e3e9250ef319b6e77cdbc25dc4d26084c14f
+# http://en.opensuse.org/Fcache-howto
 Patch6:		kernel-desktop-fcache.patch
+
+# Con Kolivas patchset
 Patch7:		kernel-desktop-ck.patch
-Patch8:		kernel-desktop-nock-compat.patch
 
 Patch9:		kernel-desktop-grsec-minimal.patch
 
@@ -512,22 +513,18 @@
 %{__bzip2} -dc %{SOURCE2} | %{__patch} -p1 -s
 
 %if %{with preemptrt}
-%patch0 -p1
+#%patch0 -p1
+: premptrt patch is not ready yet
+exit 1
 %endif
 
+# Jens Axboe's fcache patch
+%patch6 -p1
+
 # Con Kolivas patchset
 %if %{with ck}
-%if %{with preemptrt}
-#%%patch6 -p1	NEEDS UPDATE
-: ck patch for preemptrt-patched kernel is not prepared
-: try --without ck
-exit 1
-%else
 %patch7 -p1
-%endif
 %else
-#%patch8 -p1
-%endif
 
 # grsecurity
 %if %{with grsec_minimal}
@@ -1034,6 +1031,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.110  2007/08/19 11:01:43  adamg
+- netfilter todo entry done
+- apply Jens Axboe's fcache patch unconditionally (not part of ck)
+- nock-compat patch no longer needed (was related to fcache patch which
+  we apply unconditionally now)
+- fbsplash updated wrt fcache patch
+- preemptrt updated - applies, but conflicts with other patches
+
 Revision 1.109  2007/08/18 20:35:02  adamg
 - inconsistency fixed - we were using %{arch}-smp.config while in %build
   we were trying to read %{arch}.config
================================================================

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