diff options
| author | Dave Jones <davej@redhat.com> | 2010-08-01 20:50:01 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2010-08-01 20:50:01 -0400 |
| commit | 67e704894991a2aede9fa2ea233d6a983c40f65e (patch) | |
| tree | b1b10fe0a9638879c9df5962b5c1c57c843b0285 | |
| parent | 89d0d881ff2957613051b4b33604c88e947f25ba (diff) | |
| download | kernel-67e704894991a2aede9fa2ea233d6a983c40f65e.tar.gz kernel-67e704894991a2aede9fa2ea233d6a983c40f65e.tar.xz kernel-67e704894991a2aede9fa2ea233d6a983c40f65e.zip | |
Rebase to final 2.6.35
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | sources | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 2e1ce1c52..39eeb994a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog *.rpm kernel-2.6.*/ patch-2.6.35-rc6-git6.bz2 +linux-2.6.35.tar.bz2 diff --git a/kernel.spec b/kernel.spec index 8bfc4284f..4878d6a66 100644 --- a/kernel.spec +++ b/kernel.spec @@ -48,13 +48,13 @@ Summary: The Linux kernel # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec). # scripts/rebase.sh should be made to do that for you, actually. # -%global baserelease 58 +%global baserelease 0 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base, # which yields a base_sublevel of 21. -%define base_sublevel 34 +%define base_sublevel 35 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -79,9 +79,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 6 +%define rcrev 0 # The git snapshot level -%define gitrev 6 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 2.6.%{upstream_sublevel} %endif @@ -1867,6 +1867,9 @@ fi %changelog * Sun Aug 01 2010 Dave Jones <davej@redhat.com> +- Linux 2.6.35 + +* Sun Aug 01 2010 Dave Jones <davej@redhat.com> - 2.6.35-rc6-git6 * Fri Jul 30 2010 Jarod Wilson <jarod@redhat.com> @@ -1,3 +1 @@ -10eebcb0178fb4540e2165bfd7efc7ad linux-2.6.34.tar.bz2 -1205481c8d1b5ccecad87840ddaeaf81 patch-2.6.35-rc6.bz2 -f73d01927a3150e729b44add5ea4923c patch-2.6.35-rc6-git6.bz2 +091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2 |