[kernel] update to 3.0-rc2

Kyle McMartin kyle at fedoraproject.org
Wed Jun 8 05:36:07 UTC 2011


commit 99b6793a5de50335f9898a96e31016b206955aa7
Author: Kyle McMartin <kmcmartin at redhat.com>
Date:   Wed Jun 8 01:15:33 2011 -0400

    update to 3.0-rc2
    
    also build in ipv6 for the reasons documented by notting here
    http://lists.fedoraproject.org/pipermail/kernel/2011-June/003105.html

 config-generic                  |    2 +-
 kernel.spec                     |   11 ++++++++---
 linux-3.0-fix-uts-release.patch |    2 +-
 sources                         |    2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/config-generic b/config-generic
index 6b18a41..524e8fd 100644
--- a/config-generic
+++ b/config-generic
@@ -814,7 +814,7 @@ CONFIG_IP_VS_NQ=m
 CONFIG_IP_VS_FTP=m
 CONFIG_IP_VS_PE_SIP=m
 
-CONFIG_IPV6=m
+CONFIG_IPV6=y
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
diff --git a/kernel.spec b/kernel.spec
index 11cbce6..42d3d40 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
@@ -83,7 +83,7 @@ Summary: The Linux kernel
 # % define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
 %define upstream_sublevel 0
 # The rc snapshot level
-%define rcrev 1
+%define rcrev 2
 # The git snapshot level
 %define gitrev 0
 # Set rpm version accordingly
@@ -531,7 +531,7 @@ BuildRequires: rpm-build >= 4.4.2.1-4
 %endif
 
 # Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
-Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc1.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc2.tar.bz2
 
 Source11: genkey
 Source14: find-provides
@@ -1931,6 +1931,11 @@ fi
 # and build.
 
 %changelog
+* Wed Jun 08 2011 Kyle McMartin <kmcmartin at redhat.com> 3.0-0.rc2.git0.1
+- Update to 3.0-rc2, rebase utsname fix.
+- Build IPv6 into the kernel for a variety of reasons
+  (http://lists.fedoraproject.org/pipermail/kernel/2011-June/003105.html)
+
 * Mon Jun 06 2011 Kyle McMartin <kmcmartin at redhat.com> 3.0-0.rc1.git0.3
 - Conflict with module-init-tools older than 3.13 to ensure the
   3.0 transition is handled correctly.
diff --git a/linux-3.0-fix-uts-release.patch b/linux-3.0-fix-uts-release.patch
index f339349..a4af026 100644
--- a/linux-3.0-fix-uts-release.patch
+++ b/linux-3.0-fix-uts-release.patch
@@ -6,7 +6,7 @@ index afb8e0d..e435bf5 100644
  VERSION = 3
  PATCHLEVEL = 0
 -SUBLEVEL = 0
- EXTRAVERSION = -rc1
+ EXTRAVERSION = -rc2
  NAME = Sneaky Weasel
  
 @@ -378,9 +377,9 @@ KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
diff --git a/sources b/sources
index 4b95124..3d07db2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98afe9dd7e79f66800c30769ccd11a0f  linux-3.0-rc1.tar.bz2
+0b9f60eaad66b81ef18b0d9bb98cb6fb  linux-3.0-rc2.tar.bz2


More information about the scm-commits mailing list