I committed some extra information in the previous 2 commits. Reversing and re-commit...

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 6d06019..4a49d17 100644 (file)
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -44,13 +44,7 @@ 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 update 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 packagerelease %{kernelrelease}%{?update:.%{update}}
+%define release vs%{vsversion}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 %{!?pldistro:%global pldistro planetlab}
 
@@ -110,13 +104,17 @@ Name: kernel
 Group: System Environment/Kernel
 License: GPLv2
 Version: %{rpmversion}
-Release: %{packagerelease}
+# A kernel module update only. Very hacky, but does the job.
+# In the future, we'll split the kernel package into the main
+# kernel, and kernel modules, but for now, hacks of this kind
+# save on the operational overhead of a full kernel update.
+Release: %{release}
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}
-Provides: kernel-smp = %{rpmversion}-%{kernelrelease}
-Provides: kernel-smp-%{_target_cpu} = %{rpmversion}-%{kernelrelease}
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-smp = %{rpmversion}-%{release}
+Provides: kernel-smp-%{_target_cpu} = %{rpmversion}-%{release}
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
@@ -178,6 +176,7 @@ Patch525: linux-2.6-525-sknid-elevator.patch
 Patch526: linux-2.6-526-tun-tap.patch
 Patch527: linux-2.6-527-iptables-classify-add-mark.patch
 Patch528: linux-2.6-528-enable-stdtun.patch
+
 Patch530: linux-2.6-530-built-by-support.patch
 Patch540: linux-2.6-540-oom-kill.patch
 Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
@@ -196,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
@@ -225,9 +219,9 @@ input and output, etc.
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}
-Provides: kernel-smp-devel = %{rpmversion}-%{kernelrelease}
-Provides: kernel-smp-devel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-smp-devel = %{rpmversion}-%{release}
+Provides: kernel-smp-devel-%{_target_cpu} = %{rpmversion}-%{release}
 Prereq: /usr/bin/find
 
 %description devel
@@ -252,7 +246,7 @@ Summary: The Linux kernel compiled for unprivileged Xen guest VMs
 
 Group: System Environment/Kernel
 Provides: kernel = %{version}
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}xenU
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}xenU
 Prereq: %{kernel_prereq}
 Conflicts: %{kernel_dot_org_conflicts}
 Conflicts: %{package_conflicts}
@@ -276,9 +270,9 @@ the guest0 domain.
 Summary: Development package for building kernel modules to match the kernel.
 Group: System Environment/Kernel
 AutoReqProv: no
-Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}xenU
-Provides: kernel-devel = %{rpmversion}-%{kernelrelease}xenU
+Provides: kernel-xenU-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}xenU
+Provides: kernel-devel = %{rpmversion}-%{release}xenU
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
 %description xenU-devel
@@ -296,9 +290,9 @@ This package includes a user mode version of the Linux kernel.
 %package uml-devel
 Summary: Development package for building kernel modules to match the UML kernel.
 Group: System Environment/Kernel
-Provides: kernel-uml-devel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}
-Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}smp
-Provides: kernel-devel = %{rpmversion}-%{kernelrelease}smp
+Provides: kernel-uml-devel-%{_target_cpu} = %{rpmversion}-%{release}
+Provides: kernel-devel-%{_target_cpu} = %{rpmversion}-%{release}smp
+Provides: kernel-devel = %{rpmversion}-%{release}smp
 AutoReqProv: no
 Prereq: /usr/sbin/hardlink, /usr/bin/find
 
@@ -320,7 +314,7 @@ Summary: A placeholder RPM that provides kernel and kernel-drm
 Group: System Environment/Kernel
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{kernelrelease}
+Provides: kernel-%{_target_cpu} = %{rpmversion}-%{release}
 
 %description vserver
 VServers do not require and cannot use kernels, but some RPMs have
@@ -421,11 +415,7 @@ KERNEL_PREVIOUS=vanilla
 %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
@@ -498,11 +488,11 @@ BuildKernel() {
       DevelLink=
     fi
 
-    KernelVer=%{version}-%{kernelrelease}$Flavour
+    KernelVer=%{version}-%{release}$Flavour
     echo BUILDING A KERNEL FOR $Flavour %{_target_cpu}...
 
     # make sure EXTRAVERSION says what we want it to say
-    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?patchlevel:.%{patchlevel}}-%{kernelrelease}$Flavour/" Makefile
+    perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?patchlevel:.%{patchlevel}}-%{release}$Flavour/" Makefile
 
     # and now to start the build process
 
@@ -754,7 +744,7 @@ if echo $rootdev |grep -q /dev/mapper 2>/dev/null ; then
     fi
 fi
 
-[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{kernelrelease}
+[ ! -x /usr/sbin/module_upgrade ] || /usr/sbin/module_upgrade %{rpmversion}-%{release}
 #/sbin/new-kernel-pkg --package kernel --mkinitrd --depmod --install %{KVERREL}
 # Older modutils do not support --package option
 /sbin/new-kernel-pkg --mkinitrd --depmod --install %{KVERREL}
@@ -777,7 +767,6 @@ popd > /dev/null
 
 # ask for a reboot
 mkdir -p /etc/planetlab
-touch /etc/planetlab/update-reboot
 
 %post devel
 [ -f /etc/sysconfig/kernel ] && . /etc/sysconfig/kernel
@@ -900,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