Author: arekm                        Date: Mon Jul 14 19:20:08 2008 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- initial up to 2.6.26

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1935 -> 1.441.2.1936) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1935 SPECS/kernel.spec:1.441.2.1936
--- SPECS/kernel.spec:1.441.2.1935      Mon Jul 14 12:34:50 2008
+++ SPECS/kernel.spec   Mon Jul 14 21:20:02 2008
@@ -105,12 +105,12 @@
 %define                have_oss        0
 %endif
 
-%define                _basever                2.6.25
-%define                _postver                .11
+%define                _basever                2.6.26
+%define                _postver                %{nil}
 %define                _prepatch               %{nil}
 %define                _pre_rc                 %{nil}
 %define                _rc                     %{nil}
-%define                _rel                    1
+%define                _rel                    0.1
 
 %define                _enable_debug_packages                  0
 
@@ -149,7 +149,7 @@
 Group:         Base/Kernel
 #Source0:      
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/linux-%{version}%{_rc}.tar.bz2
 Source0:       
http://www.kernel.org/pub/linux/kernel/v2.6/linux-%{_basever}%{_rc}.tar.bz2
-# Source0-md5: db95a49a656a3247d4995a797d333153
+# Source0-md5: 5169d01c405bc3f866c59338e217968c
 %if "%{_prepatch}" != "%{nil}"
 Source90:      
http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-%{_prepatch}-%{_pre_rc}.bz2
 # Source90-md5:        b78873f8a3aff5bdc719fc7fb4c66a9b
@@ -310,20 +310,14 @@
 Patch140:      kernel-unionfs.patch
 Patch141:      kernel-unionfs-vserver.patch
 
-# aic94xx patch based on 
http://georgi.unixsol.org/programs/aic94xx_with_included_firmware_2.6.21.diff
-Patch160:      linux-2.6-aic94xx_with_included_firmware.patch
-
 Patch200:      linux-2.6-ppc-ICE-hacks.patch
 
-Patch205:      linux-2.6-ppc-mediabay.patch
-
 # The following patch extend the routing functionality in Linux
 # to support static routes (defined by user), new way to use the
 # alternative routes, the reverse path protection (rp_filter),
 # the NAT processing to use correctly the routing when multiple
 # gateways are used.
 # http://www.ssi.bg/~ja/routes-2.6.25-15.diff
-# We need to disable CONFIG_IP_ROUTE_MULTIPATH_CACHED
 Patch300:      kernel-routes.patch
 
 Patch1000:     linux-2.6-grsec-minimal.patch
@@ -346,8 +340,6 @@
 # based on 
http://www.udpcast.linux.lu/download/bzip2-lzma-kernel-2.6.23.12.patch.gz
 Patch7001:     kernel-bzip2-lzma.patch
 
-Patch9996:     linux-2.6-security-opt.patch
-
 # not ready yet
 Patch9997:     pax_selinux_hooks-2.6.20.patch
 
@@ -880,9 +872,6 @@
 %patch140 -p1
 %{?with_vserver:%patch141 -p1}
 
-# aic94xx linux-2.6-aic94xx_with_included_firmware.patch
-%patch160 -p1
-
 %patch2500 -p1
 
 %if %{with rescuecd}
@@ -912,8 +901,6 @@
 %endif
 %endif
 
-%patch9996 -p1
-
 %if %{with pax}
 # now we have an separate testing pax-only patch - in the future we
 # could have single grsecurity patch and will have to prepare separate
@@ -941,10 +928,9 @@
 #patch200 -p1
 %endif
 
-%patch205 -p1
-
 # routes
-%patch300 -p1
+# FIXME
+#%patch300 -p1
 
 # Small fixes:
 %patch2000 -p1
@@ -1710,6 +1696,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1936  2008/07/14 19:20:02  arekm
+- initial up to 2.6.26
+
 Revision 1.441.2.1935  2008/07/14 10:34:50  arekm
 - up to 2.6.25.11
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to