[kernel/f18] Move power-x86-destdir.patch to apply on vanilla kernels (thanks knurd)

Josh Boyer jwboyer at fedoraproject.org
Tue Oct 30 18:04:03 UTC 2012


commit 4acebb2503939a1021ea56b2914c435b511c27ed
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 d2bd5cf..9a442cf 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -644,6 +644,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}
 
 
@@ -748,8 +750,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
 
@@ -1344,6 +1344,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
@@ -1487,8 +1489,6 @@ ApplyPatch lis3-improve-handling-of-null-rate.patch
 
 ApplyPatch i82975x-edac-fix.patch
 
-ApplyPatch power-x86-destdir.patch
-
 #rhbz 754518
 ApplyPatch scsi-sd_revalidate_disk-prevent-NULL-ptr-deref.patch
 
@@ -2380,6 +2380,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %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