dropping web100 as discussed with sapan

[linux-2.6.git] / kernel-2.6.spec

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 43115b1..69815c9 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -44,16 +44,18 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # updated every time the PL kernel is updated.
 %define vini_pl_patch 561
 
+%define updatelevel 1
+
 # Tweak for being able to issue updates with the same kernel version, but with
 # a different package version.
-%define kernelrelease vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define kernelrelease vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}%{?updatelevel:.%{updatelevel}}
 %define packagerelease %{kernelrelease}
 
 %{!?pldistro:%global pldistro planetlab}
 
 %define signmodules 0
 %define make_target bzImage
-%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
+%define KVERREL %{PACKAGE_VERSION}-%{kernelrelease}
 
 # Override generic defaults with per-arch defaults
 
@@ -193,12 +195,7 @@ Patch670: linux-2.6-670-gcc43.patch
 %endif
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
-Patch700: linux-2.6-700-fperm.patch
 Patch710: linux-2.6-710-avoid-64bits-addr-pcmcia.patch
-# This one is a backport from usptream.
-Patch720: linux-2.6-720-bonding-layer23.patch
-Patch721: linux-2.6-721-bonding-layer3.patch
-Patch722: linux-2.6-722-bonding-rr.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -417,12 +414,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 670
 %endif
 %ApplyPatch 680
-%ApplyPatch 690
-%ApplyPatch 700
 %ApplyPatch 710
-%ApplyPatch 720
-%ApplyPatch 721
-%ApplyPatch 722
 
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
@@ -774,7 +766,7 @@ popd > /dev/null
 
 # ask for a reboot
 mkdir -p /etc/planetlab
-touch /etc/planetlab/update-reboot
+#touch /etc/planetlab/update-reboot
 
 %post devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -897,15 +889,6 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
-* Fri Jun 26 2009 Daniel Hokka Zakrisson <daniel@hozac.com> - linux-2.6-22-42
-- Bonding and multipath things.
-
-* Thu Jun 11 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-41
-- configs for the embedemu pldistro
-
-* Wed Jun 03 2009 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-22-40
-- Added patch 700, which implements VXC_PROC_WRITE support
-
 * Tue May 26 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-22-39
 - outputs the kernel-headers rpm as backported from 2.6.27