git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add patch to revert condition that can set RTT=0
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
2d8bc61
..
04dc109
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-10,9
+10,10
@@
URL: %{SCMURL}
%define name linux-2.6
%define module_version_varname sublevel
%define name linux-2.6
%define module_version_varname sublevel
-%define taglevel 26
+# 131 borrowed from centos6.1, tg3 from 220 centos 6.2
+%define taglevel 131.vs230.web10027.xidmask.2
-%define sublevel 3
2
+%define sublevel 3
3
%if ("%{distro}" == "Fedora" && %{distrorelease} >= 12) || ("%{distro}" == "SL" && %{distrorelease} >= 6) || ("%{distro}" == "CentOS" && %{distrorelease} >= 6)
%define modern_distro 1
%if ("%{distro}" == "Fedora" && %{distrorelease} >= 12) || ("%{distro}" == "SL" && %{distrorelease} >= 6) || ("%{distro}" == "CentOS" && %{distrorelease} >= 6)
%define modern_distro 1
@@
-232,6
+233,8
@@
Summary: The Linux kernel
%define pkg_release %{distro_build}%{?dist}%{?buildid}
%endif
#### Planet-Lab ####
%define pkg_release %{distro_build}%{?dist}%{?buildid}
%endif
#### Planet-Lab ####
+#%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}.mlab%{?date:.%{date}}
+# this branch is now unique to the mlab build. so pldistro==mlab
%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
#### Planet-Lab ####
%define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
%define pkg_release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
#### Planet-Lab ####
%define KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
@@
-681,6
+684,10
@@
Patch17: linux-2.6-640-netlink-audit-hack.patch
Patch18: linux-2.6-650-hangcheck-reboot.patch
Patch19: linux-2.6-660-nmi-watchdog-default.patch
Patch20: linux-2.6-680-htb-hysteresis-tso.patch
Patch18: linux-2.6-650-hangcheck-reboot.patch
Patch19: linux-2.6-660-nmi-watchdog-default.patch
Patch20: linux-2.6-680-htb-hysteresis-tso.patch
+Patch21: linux-2.6-690-web100.patch
+Patch22: linux-2.6-700-bcm5720.patch
+Patch23: linux-2.6-710-xidmask.patch
+Patch24: linux-2.6-720-undo-rttzero.patch
Patch10000: linux-2.6-10000-gcc-4.5.patch
Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
Patch10000: linux-2.6-10000-gcc-4.5.patch
Patch10001: linux-2.6-10001-gcc-4.6-warnoff.patch
@@
-1000,6
+1007,10
@@
ApplyPatch linux-2.6-640-netlink-audit-hack.patch
ApplyPatch linux-2.6-650-hangcheck-reboot.patch
ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
ApplyPatch linux-2.6-650-hangcheck-reboot.patch
ApplyPatch linux-2.6-660-nmi-watchdog-default.patch
ApplyPatch linux-2.6-680-htb-hysteresis-tso.patch
+ApplyPatch linux-2.6-690-web100.patch
+ApplyPatch linux-2.6-700-bcm5720.patch
+ApplyPatch linux-2.6-710-xidmask.patch
+ApplyPatch linux-2.6-720-undo-rttzero.patch
ApplyPatch linux-2.6-10000-gcc-4.5.patch
ApplyPatch linux-2.6-10001-gcc-4.6-warnoff.patch
ApplyPatch linux-2.6-10002-gcc-4.6-sense_buffer.patch
ApplyPatch linux-2.6-10000-gcc-4.5.patch
ApplyPatch linux-2.6-10001-gcc-4.6-warnoff.patch
ApplyPatch linux-2.6-10002-gcc-4.6-sense_buffer.patch
@@
-1788,6
+1799,9
@@
fi
%endif
%changelog
%endif
%changelog
+* Mon Nov 07 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - linux-2.6-32-27
+- 2 places for pulling sources from in case of network outage
+
* Wed Oct 05 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-26
- Tweak to the f8 build-fixing patch
* Wed Oct 05 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - linux-2.6-32-26
- Tweak to the f8 build-fixing patch