Rebase to final 2.6.35
This commit is contained in:
parent
89d0d881ff
commit
67e7048949
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@ clog
|
|||||||
*.rpm
|
*.rpm
|
||||||
kernel-2.6.*/
|
kernel-2.6.*/
|
||||||
patch-2.6.35-rc6-git6.bz2
|
patch-2.6.35-rc6-git6.bz2
|
||||||
|
linux-2.6.35.tar.bz2
|
||||||
|
11
kernel.spec
11
kernel.spec
@ -48,13 +48,13 @@ Summary: The Linux kernel
|
|||||||
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
|
# 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.
|
# scripts/rebase.sh should be made to do that for you, actually.
|
||||||
#
|
#
|
||||||
%global baserelease 58
|
%global baserelease 0
|
||||||
%global fedora_build %{baserelease}
|
%global fedora_build %{baserelease}
|
||||||
|
|
||||||
# base_sublevel is the kernel version we're starting with and patching
|
# 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,
|
# on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
|
||||||
# which yields a base_sublevel of 21.
|
# which yields a base_sublevel of 21.
|
||||||
%define base_sublevel 34
|
%define base_sublevel 35
|
||||||
|
|
||||||
## If this is a released kernel ##
|
## If this is a released kernel ##
|
||||||
%if 0%{?released_kernel}
|
%if 0%{?released_kernel}
|
||||||
@ -79,9 +79,9 @@ Summary: The Linux kernel
|
|||||||
# The next upstream release sublevel (base_sublevel+1)
|
# The next upstream release sublevel (base_sublevel+1)
|
||||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||||
# The rc snapshot level
|
# The rc snapshot level
|
||||||
%define rcrev 6
|
%define rcrev 0
|
||||||
# The git snapshot level
|
# The git snapshot level
|
||||||
%define gitrev 6
|
%define gitrev 0
|
||||||
# Set rpm version accordingly
|
# Set rpm version accordingly
|
||||||
%define rpmversion 2.6.%{upstream_sublevel}
|
%define rpmversion 2.6.%{upstream_sublevel}
|
||||||
%endif
|
%endif
|
||||||
@ -1866,6 +1866,9 @@ fi
|
|||||||
# || ||
|
# || ||
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Aug 01 2010 Dave Jones <davej@redhat.com>
|
||||||
|
- Linux 2.6.35
|
||||||
|
|
||||||
* Sun Aug 01 2010 Dave Jones <davej@redhat.com>
|
* Sun Aug 01 2010 Dave Jones <davej@redhat.com>
|
||||||
- 2.6.35-rc6-git6
|
- 2.6.35-rc6-git6
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user