From: S.Çağlar Onur Date: Thu, 11 Feb 2010 18:36:05 +0000 (+0000) Subject: use the old vserver patch for now X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=6592c541be28bf17df097337e2b7b0296916a72a use the old vserver patch for now --- diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 9cde68950..57d873832 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -34,7 +34,7 @@ Summary: The Linux kernel (the core of the Linux operating system) %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}} -%define vsversion 2.3.0.36.8 +%define vsversion 2.3.0.36.4 # Will go away when VServer supports NetNS in mainline. Currently, it must be # updated every time the PL kernel is updated. @@ -143,7 +143,7 @@ Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2 Patch100: linux-2.6-100-build-nonintconfig.patch # Linux-VServer -Patch200: patch-2.6.27.39-vs%{vsversion}.diff +Patch200: patch-%{rpmversion}-vs%{vsversion}.diff Patch220: delta-ptrace-fix01.diff # IP sets diff --git a/sources b/sources index 729f93b98..45e8edb96 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ b3e78977aa79d3754cb7f8143d7ddabd http://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2 9ad766753f54ba0a4df7c42873e7aa16 http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.45.bz2 -c71fbcfd84dd9b386d1b91e89bf346ba http://www.cs.princeton.edu/~caglar/patch-2.6.27.39-vs2.3.0.36.8.diff +f5fdebad83fcfaf555725ee8dcdf95e6 http://www.cs.princeton.edu/~caglar/patch-2.6.27.45-vs2.3.0.36.4.diff