ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

update to 3.0-rc3-git5

Browse Source
This commit is contained in:
Kyle McMartin 2011-06-17 11:40:56 -04:00
parent ff5dfe257c
commit a8a2918cfc
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-generic
View File

@ -6,6 +6,7 @@ CONFIG_SMP=y
CONFIG_HOTPLUG_CPU=y CONFIG_HOTPLUG_CPU=y
CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION=""
CONFIG_CROSS_COMPILE="" CONFIG_CROSS_COMPILE=""
CONFIG_DEFAULT_HOSTNAME="(none)"
# #
# Code maturity level options # Code maturity level options
@ -3947,6 +3948,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not set # CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_PROGEAR=m CONFIG_BACKLIGHT_PROGEAR=m
# CONFIG_BACKLIGHT_ADP8860 is not set # CONFIG_BACKLIGHT_ADP8860 is not set
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_FB_NVIDIA_BACKLIGHT=y CONFIG_FB_NVIDIA_BACKLIGHT=y
CONFIG_FB_RIVA_BACKLIGHT=y CONFIG_FB_RIVA_BACKLIGHT=y
CONFIG_FB_RADEON_BACKLIGHT=y CONFIG_FB_RADEON_BACKLIGHT=y

11
kernel.spec
View File

@ -51,7 +51,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be prepended with "0.", so # For non-released -rc kernels, this will be prepended with "0.", so
# for example a 3 here will become 0.3 # for example a 3 here will become 0.3
# #
%global baserelease 3 %global baserelease 1
%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
@ -85,7 +85,7 @@ Summary: The Linux kernel
# The rc snapshot level # The rc snapshot level
%define rcrev 3 %define rcrev 3
# The git snapshot level # The git snapshot level
%define gitrev 0 %define gitrev 5
# Set rpm version accordingly # Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel} %define rpmversion 3.%{upstream_sublevel}
%endif %endif
@ -944,7 +944,7 @@ ApplyPatch()
fi fi
%if !%{using_upstream_branch} %if !%{using_upstream_branch}
if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then
if [ "${patch:0:10}" != "patch-3." ] ; then if [ "${patch:0:8}" != "patch-3." ] ; then
echo "ERROR: Patch $patch not listed as a source patch in specfile" echo "ERROR: Patch $patch not listed as a source patch in specfile"
exit 1 exit 1
fi fi
@ -1930,6 +1930,11 @@ fi
# and build. # and build.
%changelog %changelog
* Fri Jun 17 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc3.git5.1
- Try updating to a git snapshot for the first time in 3.0-rc,
update to 3.0-rc3-git5
- Fix a subtle bug I introduced in 3.0-rc1, "patch-3." is 9 letters, not 10.
* Thu Jun 16 2011 Kyle McMartin <kmcmartin@redhat.com> * Thu Jun 16 2011 Kyle McMartin <kmcmartin@redhat.com>
- Disable mm patches which had been submitted against 2.6.39, as Rik reports - Disable mm patches which had been submitted against 2.6.39, as Rik reports
they seem to aggravate a VM_BUG_ON. More investigation is necessary. they seem to aggravate a VM_BUG_ON. More investigation is necessary.

4
linux-3.0-fix-uts-release.patch
View File

@ -1,5 +1,5 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index badb923..7b2e16d 100644 index 0499c2e..86b01e8 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -7,6 +7,6 @@ index badb923..7b2e16d 100644
PATCHLEVEL = 0 PATCHLEVEL = 0
-SUBLEVEL = 0 -SUBLEVEL = 0
+SUBLEVEL = +SUBLEVEL =
EXTRAVERSION = -rc3 EXTRAVERSION = -rc3-git5
NAME = Sneaky Weasel NAME = Sneaky Weasel

1
sources
View File

@ -1 +1,2 @@
b6c6b67b3b2272b90881fc653cc50156 linux-3.0-rc3.tar.bz2 b6c6b67b3b2272b90881fc653cc50156 linux-3.0-rc3.tar.bz2
487f578a01ea1630d12e2c726530a618 patch-3.0-rc3-git5.bz2