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
trying to fix following warning: 'override: reassigning to symbol SYSFS_DEPRECATED_V2'
[linux-2.6.git]
/
kernel-2.6.spec
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
9736a3f
..
3c3a993
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-4,13
+4,13
@@
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab %{plrelease}
Vendor: PlanetLab
Packager: PlanetLab Central <support@planet-lab.org>
Distribution: PlanetLab %{plrelease}
-URL: %
(echo %{url} | cut -d ' ' -f 2)
+URL: %
{SCMURL}
%{!?pldistro:%global pldistro planetlab}
%define name linux-2.6
%define module_version_varname sublevel
%{!?pldistro:%global pldistro planetlab}
%define name linux-2.6
%define module_version_varname sublevel
-%define taglevel
5
+%define taglevel
7
%define sublevel 32
#### Planet-Lab ####
%define sublevel 32
#### Planet-Lab ####
@@
-124,8
+124,14
@@
Summary: The Linux kernel
%define with_perftool %{?_without_perftool: 0} %{?!_without_perftool: 1}
# perf noarch subpkg
%define with_perf %{?_without_perf: 0} %{?!_without_perf: 1}
%define with_perftool %{?_without_perftool: 0} %{?!_without_perftool: 1}
# perf noarch subpkg
%define with_perf %{?_without_perf: 0} %{?!_without_perf: 1}
+#### Planet-Lab ####
# kernel-debuginfo
# kernel-debuginfo
+%if "%{distro}" == "CentOS" && %{distrorelease} == 5
+%define with_debuginfo %{?_without_debuginfo: 1} %{?!_without_debuginfo: 0}
+%else
%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
+%endif
+#### Planet-Lab ####
# kernel-bootwrapper (for creating zImages from kernel + initrd)
%define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
# Want to build a the vsdo directories installed
# kernel-bootwrapper (for creating zImages from kernel + initrd)
%define with_bootwrapper %{?_without_bootwrapper: 0} %{?!_without_bootwrapper: 1}
# Want to build a the vsdo directories installed
@@
-504,7
+510,7
@@
Summary: The Linux kernel
%if "%{distro}" == "Fedora" && %{distrorelease} >= 12
%define initrd_prereq mkinitrd >= 6.0.61-1
%else
%if "%{distro}" == "Fedora" && %{distrorelease} >= 12
%define initrd_prereq mkinitrd >= 6.0.61-1
%else
-%define initrd_prereq mkinitrd >=
6.0.19-
1
+%define initrd_prereq mkinitrd >=
5.
1
%endif
#### Planet-Lab ####
%endif
%endif
#### Planet-Lab ####
%endif
@@
-1773,6
+1779,12
@@
fi
%endif
%changelog
%endif
%changelog
+* Thu Jan 06 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-7
+- Adjust mkinitrd requirement for CentOS 5
+
+* Wed Jan 05 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-6
+- Disable debuginfo packages for CentOS 5
+
* Wed Dec 22 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-5
- Fix problems caused by gcc 4.5.1 on F14
* Wed Dec 22 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - linux-2.6-32-5
- Fix problems caused by gcc 4.5.1 on F14