X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.spec;h=39f1d7594b4bf11ac85539b27c7790be73ee5cf3;hb=refs%2Fheads%2F27;hp=fb2506ff1b84da07fe6237c0cf94516077ae6451;hpb=dba9ed24940ccda7d17462b7bf23729f7a4a199b;p=linux-2.6.git

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index fb2506ff1..39f1d7594 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -1,5 +1,3 @@
-%define url $URL$
-
 Summary: The Linux kernel (the core of the Linux operating system)
 
 # What parts do we want to build?  We must build at least one kernel.
@@ -25,7 +23,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 # for module-tag.py - sublevel is used for the version (middle) part of tag names
 %define name linux-2.6
 %define module_version_varname sublevel
-%define taglevel 31
+%define taglevel 38
 
 #
 # Polite request for people who spin their own kernel rpms:
@@ -34,7 +32,7 @@ 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 56
+%define patchlevel 57
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}}
 
@@ -48,11 +46,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 
 %define signmodules 0
 %define make_target bzImage
-%if "%{distro}" == "Fedora" && %{distrorelease} >= 13
 %define KVERREL %{version}-%{release}
-%else
-%define KVERREL %{PACKAGE_VERSION}-%{PACKAGE_RELEASE}
-%endif
 
 # Override generic defaults with per-arch defaults
 
@@ -99,7 +93,7 @@ Summary: The Linux kernel (the core of the Linux operating system)
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Name: kernel
 Group: System Environment/Kernel
@@ -156,6 +150,7 @@ Patch000: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-%{rpmversion}.bz2
 %endif
 
 Patch010: linux-2.6-010-e1000e-ich10lan.patch
+#Patch011: linux-2.6-011-e1000e-82574L.patch
 Patch017: linux-2.6-017-bnx2.patch
 
 Patch100: linux-2.6-100-build-nonintconfig.patch
@@ -200,6 +195,7 @@ Patch800: linux-2.6-800-rename-ext4dev-to-ext4.patch
 
 #Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch
 #Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch
+Patch911: linux-2.6-911-perftools-f8-build.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
@@ -363,6 +359,9 @@ KERNEL_PREVIOUS=vanilla
 %endif
 
 %ApplyPatch 10
+%if 0
+%ApplyPatch 11
+%endif
 %ApplyPatch 17
 
 %ApplyPatch 100
@@ -838,6 +837,27 @@ rm -f /lib/modules/%{KVERREL}uml/modules.*
 %endif
 
 %changelog
+* Mon Sep 26 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-27-38
+- no functional change, just pull the patch file from our mirror
+
+* Tue Aug 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-27-37
+- fixed patch filename
+
+* Thu Jul 21 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-27-36
+- This patch fixes an issue that causes Build to fail on f8.
+
+* Sat Mar 26 2011 S.Çağlar Onur <caglar@verivue.com> - linux-2.6-27-35
+- Use build-planetlab.prg
+
+* Mon Jan 24 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-27-34
+- no semantic change - just fixed specfile for git URL
+
+* Fri Dec 10 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-27-33
+- Bump to 2.6.27.57
+
+* Thu Dec 02 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-27-32
+- harmless changes in specfile to build on fedora14
+
 * Tue Nov 23 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-27-31
 - Bump to 2.6.27.56