diff options
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | kernel.spec | 11 | ||||
| -rw-r--r-- | linux-3.0-fix-uts-release.patch | 4 | ||||
| -rw-r--r-- | sources | 1 |
4 files changed, 13 insertions, 5 deletions
diff --git a/config-generic b/config-generic index 524e8fd47..2dd45c858 100644 --- a/config-generic +++ b/config-generic @@ -6,6 +6,7 @@ CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y CONFIG_LOCALVERSION="" CONFIG_CROSS_COMPILE="" +CONFIG_DEFAULT_HOSTNAME="(none)" # # Code maturity level options @@ -3947,6 +3948,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=m # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_PROGEAR=m # CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set CONFIG_FB_NVIDIA_BACKLIGHT=y CONFIG_FB_RIVA_BACKLIGHT=y CONFIG_FB_RADEON_BACKLIGHT=y diff --git a/kernel.spec b/kernel.spec index a410c3643..d0891b330 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 @@ -85,7 +85,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 3 # The git snapshot level -%define gitrev 0 +%define gitrev 5 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel} %endif @@ -944,7 +944,7 @@ ApplyPatch() fi %if !%{using_upstream_branch} 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" exit 1 fi @@ -1930,6 +1930,11 @@ fi # and build. %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> - 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. diff --git a/linux-3.0-fix-uts-release.patch b/linux-3.0-fix-uts-release.patch index 7cbd902fc..13b71ce68 100644 --- a/linux-3.0-fix-uts-release.patch +++ b/linux-3.0-fix-uts-release.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index badb923..7b2e16d 100644 +index 0499c2e..86b01e8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ @@ -7,6 +7,6 @@ index badb923..7b2e16d 100644 PATCHLEVEL = 0 -SUBLEVEL = 0 +SUBLEVEL = - EXTRAVERSION = -rc3 + EXTRAVERSION = -rc3-git5 NAME = Sneaky Weasel @@ -1 +1,2 @@ b6c6b67b3b2272b90881fc653cc50156 linux-3.0-rc3.tar.bz2 +487f578a01ea1630d12e2c726530a618 patch-3.0-rc3-git5.bz2 |