SPECS (LINUX_2_6): kernel.spec - rel 0.5 - updated vserver to 2.1....

baggins baggins at pld-linux.org
Thu Apr 20 16:08:02 CEST 2006


Author: baggins                      Date: Thu Apr 20 14:08:02 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- rel 0.5
- updated vserver to 2.1.1-rc17
- fixed suspend2 patch

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1502 -> 1.441.2.1503) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1502 SPECS/kernel.spec:1.441.2.1503
--- SPECS/kernel.spec:1.441.2.1502	Thu Apr 20 14:44:01 2006
+++ SPECS/kernel.spec	Thu Apr 20 16:07:57 2006
@@ -90,7 +90,7 @@
 %define		_udev_ver		071
 %define		_mkvmlinuz_ver		1.3
 
-%define		_rel			0.4
+%define		_rel			0.5
 
 %define		_netfilter_snap		20060329
 %define		_nf_hipac_ver		0.9.1
@@ -241,6 +241,8 @@
 # from http://www.cl.cam.ac.uk/Research/SRG/netos/xen/downloads/xen-3.0.2-src.tgz
 Patch120:	xen-3.0-2.6.16.patch
 
+# Fix foobar in suspend2 patch for 2.6.16.6+
+Patch200:	suspend2-2.2.4.2-for-2.6.16.9-fix.patch
 
 Patch1000:	linux-2.6-grsec-minimal.patch
 
@@ -669,11 +671,11 @@
 install %{SOURCE5} Makefile.ppclibs
 %endif
 
+%patch200 -p1
 %if %{with suspend2}
-for i in suspend2-%{suspend_version}-for-2.6.16.9/*.patch; do
+for i in suspend2-%{suspend_version}-for-2.6.16.9/[0-9]*; do
 patch -p1 -s < $i
 done
-patch -p1 -s < suspend2-%{suspend_version}-for-2.6.16.9/3010-fork-non-conflicting-pages-for-copyback
 %endif
 
 # reiserfs4
@@ -1595,6 +1597,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1503  2006/04/20 14:07:57  baggins
+- rel 0.5
+- updated vserver to 2.1.1-rc17
+- fixed suspend2 patch
+
 Revision 1.441.2.1502  2006/04/20 12:44:01  baggins
 - suspend2 updated to 2.2.4.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1502&r2=1.441.2.1503&f=u



More information about the pld-cvs-commit mailing list