[kernel/f15] Apply patches from 3.0.2rc1
Dave Jones
davej at fedoraproject.org
Sun Aug 14 00:30:16 UTC 2011
commit a81be4733d73502aadd3166a7300ebbec746a249
Author: Dave Jones <davej at redhat.com>
Date: Sat Aug 13 20:29:55 2011 -0400
Apply patches from 3.0.2rc1
.gitignore | 1 +
kernel.spec | 9 +++++++--
sources | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8043b13..6652bab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ clog
*.rpm
kernel-2.6.*/
kernel-3.*/
+/patch-3.0.2-rc1.gz
diff --git a/kernel.spec b/kernel.spec
index a393d55..653d0ac 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 0
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -64,7 +64,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -582,6 +582,7 @@ Source1000: config-local
Patch00: patch-3.0.bz2
Patch01: patch-3.0.1.bz2
+Patch02: patch-3.0.2-rc1.gz
# we also need compile fixes for -vanilla
@@ -1100,6 +1101,7 @@ done
# Update vanilla to the latest upstream. (2.6.39 -> 3.0)
ApplyPatch patch-3.0.bz2
ApplyPatch patch-3.0.1.bz2
+ApplyPatch patch-3.0.2-rc1.gz
ApplyPatch linux-2.6-makefile-after_link.patch
@@ -1890,6 +1892,9 @@ fi
# and build.
%changelog
+* Sat Aug 13 2011 Dave Jones <davej at redhat.com>
+- Apply patches from 3.0.2rc1
+
* Thu Aug 11 2011 Dennis Gilmore <dennis at ausil.us>
- add config for arm tegra devices
- setup kernel to build omap image (patch from David Marlin)
diff --git a/sources b/sources
index 97f423a..16e338f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
1aab7a741abe08d42e8eccf20de61e05 linux-2.6.39.tar.bz2
df5790b51f218fc5e5463162b26afbfc patch-3.0.bz2
ac49f7907f1fc85fbab92d0f1aa1552a patch-3.0.1.bz2
+67faca534354c2f9dcc3536153acf0fb patch-3.0.2-rc1.gz
More information about the scm-commits
mailing list