Rebase to final 2.6.35

This commit is contained in:
Dave Jones 2010-08-01 20:50:01 -04:00
parent 89d0d881ff
commit 67e7048949
3 changed files with 9 additions and 7 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ clog
*.rpm
kernel-2.6.*/
patch-2.6.35-rc6-git6.bz2
linux-2.6.35.tar.bz2

View File

@ -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
@ -1866,6 +1866,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

View File

@ -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