[kernel/f15-30-going-on-40] rebase to 3.0 final.
Dave Jones
davej at fedoraproject.org
Tue Jul 26 16:25:38 UTC 2011
commit 95e03a67ce789b7e799b976bb682ba94573cf9ab
Author: Dave Jones <davej at redhat.com>
Date: Tue Jul 26 12:17:13 2011 -0400
rebase to 3.0 final.
config-generic | 1 +
iwlagn-fix-dma-direction.patch | 55 ----------------------------------------
kernel.spec | 26 +++++++-----------
sources | 2 +-
4 files changed, 12 insertions(+), 72 deletions(-)
---
diff --git a/config-generic b/config-generic
index c286c54..28d710c 100644
--- a/config-generic
+++ b/config-generic
@@ -453,6 +453,7 @@ CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SRP=m
CONFIG_SCSI_SRP_ATTRS=m
CONFIG_SCSI_TGT=m
+CONFIG_SCSI_ISCI=m
CONFIG_SCSI_DH=y
CONFIG_SCSI_DH_RDAC=m
diff --git a/kernel.spec b/kernel.spec
index b6dbc80..061b073 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 0
+%global released_kernel 1
# Save original buildid for later if it's defined
%if 0%{?buildid:1}
@@ -51,13 +51,14 @@ 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 1
+%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 39
+%define fake_sublevel 40
## If this is a released kernel ##
%if 0%{?released_kernel}
@@ -75,19 +76,8 @@ Summary: The Linux kernel
%define stable_base %(echo $((%{stable_update} - 1)))
%endif
%endif
-%define rpmversion 2.6.%{base_sublevel}%{?stablerev}
+%define rpmversion 2.6.%{fake_sublevel}%{?stablerev}
-## The not-released-kernel case ##
-%else
-# The next upstream release sublevel (base_sublevel+1)
-# % define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
-%define upstream_sublevel 40
-# The rc snapshot level
-%define rcrev 5
-# The git snapshot level
-%define gitrev 0
-# Set rpm version accordingly
-%define rpmversion 2.6.%{upstream_sublevel}
%endif
# Nb: The above rcrev and gitrev values automagically define Patch00 and Patch01 below.
@@ -690,7 +680,6 @@ Patch12204: linux-2.6-enable-more-pci-autosuspend.patch
Patch12205: runtime_pm_fixups.patch
Patch12303: dmar-disable-when-ricoh-multifunction.patch
-Patch12304: iwlagn-fix-dma-direction.patch
%endif
@@ -1115,6 +1104,9 @@ do
done
%endif
+# Update vanilla to the latest upstream. (2.6.39 -> 3.0)
+ApplyPatch patch-3.0.bz2
+
ApplyOptionalPatch git-linus.diff
ApplyPatch linux-2.6-makefile-after_link.patch
@@ -1265,7 +1257,6 @@ ApplyPatch neuter_intel_microcode_load.patch
# rhbz#605888
ApplyPatch dmar-disable-when-ricoh-multifunction.patch
-ApplyPatch iwlagn-fix-dma-direction.patch
# END OF PATCH APPLICATIONS
@@ -1879,6 +1870,9 @@ fi
# and build.
%changelog
+* Tue Jul 26 2011 Dave Jones <davej at redhat.com> 2.6.40-0
+- Rebase to final 3.0 (munge to 2.6.40-0)
+
* Thu Jun 30 2011 Kyle McMartin <kmcmartin at redhat.com> 2.6.40-0.rc5.git0.1
- More than meets the eye, it's Linux 3.0-rc5 in disguise.
diff --git a/sources b/sources
index 441ddfa..ab481e1 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
1aab7a741abe08d42e8eccf20de61e05 linux-2.6.39.tar.bz2
-1572e4d01ee7642100b082b6a9184643 patch-3.0-rc5.bz2
+df5790b51f218fc5e5463162b26afbfc patch-3.0.bz2
More information about the scm-commits
mailing list