[kernel/f17] Move power-x86-destdir.patch to apply on vanilla kernels (thanks knurd)
Josh Boyer
jwboyer at fedoraproject.org
Tue Oct 30 18:03:54 UTC 2012
commit 8e8972af61081fe645c5e47dbe10f4b546a35e85
Author: Josh Boyer <jwboyer at redhat.com>
Date: Tue Oct 30 14:01:39 2012 -0400
Move power-x86-destdir.patch to apply on vanilla kernels (thanks knurd)
kernel.spec | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index f14c0a0..1f533d1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -633,6 +633,8 @@ Patch04: linux-2.6-compile-fixes.patch
# build tweak for build ID magic, even for -vanilla
Patch05: linux-2.6-makefile-after_link.patch
+Patch06: power-x86-destdir.patch
+
%if !%{nopatches}
@@ -727,8 +729,6 @@ Patch21010: arm-highbank-sata-fix.patch
Patch21020: arm-smdk310-regulator-fix.patch
Patch21021: arm-origen-regulator-fix.patch
-Patch21094: power-x86-destdir.patch
-
#rhbz 754518
Patch21235: scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -1320,6 +1320,8 @@ ApplyPatch linux-2.6-makefile-after_link.patch
#
ApplyOptionalPatch linux-2.6-compile-fixes.patch
+ApplyPatch power-x86-destdir.patch
+
%if !%{nopatches}
# revert patches from upstream that conflict or that we get via other means
@@ -1451,8 +1453,6 @@ ApplyPatch ips-noirq.patch
ApplyPatch i82975x-edac-fix.patch
-ApplyPatch power-x86-destdir.patch
-
#rhbz 754518
ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
@@ -2360,6 +2360,9 @@ fi
# '-' | |
# '-'
%changelog
+* Tue Oct 30 2012 Josh Boyer <jwboyer at redhat.com>
+- Move power-x86-destdir.patch to apply on vanilla kernels (thanks knurd)
+
* Mon Oct 29 2012 Justin M. Forbes <jforbes at redhat.com>
- Uprobes backports from upstream
More information about the scm-commits
mailing list