- updated sources to match the 2.6.27.x branch

- removed upstream patches 010, 020, 030, 040
- removed Linux-VServer patches 210, 220
- removed chopstix,kdb and gcc43
- removed obsolete patch 100 (feature in mainline)

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index e136f61..db90f66 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -33,11 +33,11 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # adding some text to the end of the version number.
 #
 %define sublevel 27
-%define patchlevel 19
+%define patchlevel 14
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}}
 
-%define vsversion 2.3.0.34
+%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,18 +143,8 @@ Source30: %{pldistro}-%{kversion}-i686-xenU.config
 Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
 %endif
 
-Patch010: linux-2.6-010-e1000e.patch
-Patch020: linux-2.6-020-build-id.patch
-Patch030: linux-2.6-030-netns.patch
-Patch040: linux-2.6-040-i_mutex-check.patch
-
-# These are patches picked up from Fedora/RHEL
-Patch100: linux-2.6-100-build-nonintconfig.patch
-
 # Linux-VServer
 Patch200: patch-%{rpmversion}-vs%{vsversion}.diff
-Patch210: linux-2.6-210-vserver-cpu-sched.patch
-Patch220: delta-ptrace-fix01.diff
 
 # IP sets
 Patch250: linux-2.6-250-ipsets.patch
@@ -175,15 +165,11 @@ Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
 Patch560: linux-2.6-560-mmconf.patch
 Patch570: linux-2.6-570-tagxid.patch
 Patch580: linux-2.6-580-show-proc-virt.patch
-Patch590: linux-2.6-590-chopstix-intern.patch
-Patch620: linux-2.6-620-kdb.patch
+# Patch590: linux-2.6-590-chopstix-intern.patch
 Patch630: linux-2.6-630-sched-fix.patch
 Patch640: linux-2.6-640-netlink-audit-hack.patch
 Patch650: linux-2.6-650-hangcheck-reboot.patch
 Patch660: linux-2.6-660-nmi-watchdog-default.patch
-%if "%{distroname}" == "f9" || "%{distroname}" == "f10"
-Patch670: linux-2.6-670-gcc43.patch
-%endif
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
 
@@ -351,20 +337,9 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 0
 %endif
 
-%ApplyPatch 10
-%ApplyPatch 20
-
 # NetNS patch for VINI
-%if 0%{?with_netns}
-%ApplyPatch 30
-%endif
-%ApplyPatch 40
-
-%ApplyPatch 100
 
 %ApplyPatch 200
-%ApplyPatch 210
-%ApplyPatch 220
 
 %ApplyPatch 250
 
@@ -386,17 +361,13 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 560
 %ApplyPatch 570
 %ApplyPatch 580
-%ApplyPatch 590
-%ApplyPatch 620
+# %ApplyPatch 590
 %ApplyPatch 630
 %ApplyPatch 640
 %ApplyPatch 650
 %ApplyPatch 660
-%if "%{distroname}" == "f9" || "%{distroname}" == "f10"
-%ApplyPatch 670
-%endif
-%ApplyPatch 680
-%ApplyPatch 690
+# %ApplyPatch 680
+# %ApplyPatch 690
 
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may

diff --git a/sources b/sources
index 55dba58..7b00af2 100644 (file)
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-2e230d005c002fb3d38a3ca07c0200d0  http://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2
-066cc3bdd2783dcd01f6ff466e449ec0  http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.22.19.bz2
+b3e78977aa79d3754cb7f8143d7ddabd  http://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2
+5ee26f54ad6f657d3f904fbbb4151a09  http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.14.bz2
 206302227c1eff2b2067651859c13794  http://intellinuxwireless.org/mac80211/downloads/mac80211-10.0.4.tgz
 e8726b20dd2f9457611019632709889a  http://intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1.2.25.tgz
-d78f1915d2ff8e96422c26573add43e5  http://ftp.linux-vserver.org/pub/kernel/vs2.3/testing/patch-2.6.22.19-vs2.3.0.34.diff
+5203c848e1d0edf6b8232a5e1bcd3e73  http://vserver.13thfloor.at/Experimental/patch-2.6.27.14-vs2.3.0.36.4.diff