diff options
| author | Chuck Ebbert <cebbert@redhat.com> | 2011-03-05 21:51:32 -0500 |
|---|---|---|
| committer | Chuck Ebbert <cebbert@redhat.com> | 2011-03-05 21:51:32 -0500 |
| commit | 3d285d429053ee1e0e9f1a3333b4116e047ea2a4 (patch) | |
| tree | 50607aa79f4f576bd55741e2d374782b800033f0 /kernel.spec | |
| parent | 3c4ea9ad7f15a2dce27521c4bc5ae66464691039 (diff) | |
| download | kernel-3d285d429053ee1e0e9f1a3333b4116e047ea2a4.tar.gz kernel-3d285d429053ee1e0e9f1a3333b4116e047ea2a4.tar.xz kernel-3d285d429053ee1e0e9f1a3333b4116e047ea2a4.zip | |
Linux 2.6.38-rc7-git4
Revert upstream commit e3e89cc535223433a619d0969db3fa05cdd946b8
for now to fix utrace build.
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index ea9d3f3bc..5559911fe 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 3 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -84,7 +84,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 7 # The git snapshot level -%define gitrev 2 +%define gitrev 4 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -614,7 +614,7 @@ Patch09: linux-2.6-upstream-reverts.patch # Standalone patches Patch20: linux-2.6-hotfixes.patch - +Patch29: linux-2.6-utrace-revert-make-ptrace-functions-static.patch Patch30: linux-2.6-tracehook.patch Patch31: linux-2.6-utrace.patch Patch32: linux-2.6-utrace-ptrace.patch @@ -1172,6 +1172,7 @@ ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R ApplyPatch linux-2.6-hotfixes.patch # Roland's utrace ptrace replacement. +ApplyPatch linux-2.6-utrace-revert-make-ptrace-functions-static.patch ApplyPatch linux-2.6-tracehook.patch ApplyPatch linux-2.6-utrace.patch ApplyPatch linux-2.6-utrace-ptrace.patch @@ -1969,6 +1970,11 @@ fi # and build. %changelog +* Sat Mar 05 2011 Chuck Ebbert <cebbert@redhat.com> 2.6.38-0.rc7.git4.1 +- Linux 2.6.38-rc7-git4 +- Revert upstream commit e3e89cc535223433a619d0969db3fa05cdd946b8 + for now to fix utrace build. + * Fri Mar 04 2011 Roland McGrath <roland@redhat.com> - 2.6.38-0.rc7.git2.3 - Split out perf-debuginfo subpackage. |