summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-03-11 08:51:00 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-03-11 08:51:02 -0400
commit73947052943a62125227728baddc88ef6934ae9d (patch)
treefd8fa29c8d2b29413413f2347ff6a48bcd0bb59d /kernel.spec
parent853ea7612f7b0c819c1ff5e33ae45f185aed504a (diff)
downloadkernel-73947052943a62125227728baddc88ef6934ae9d.tar.gz
kernel-73947052943a62125227728baddc88ef6934ae9d.tar.xz
kernel-73947052943a62125227728baddc88ef6934ae9d.zip
Revert commit that added bad rpath to cpupower (rhbz 1199312)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index f2722a557..0ea747ec3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -631,6 +631,9 @@ Patch26140: security-yama-Remove-unnecessary-selects-from-Kconfi.patch
Patch26141: mfd-rtsx_usb-prevent-DMA-from-stack.patch
+#rhbz 1199312
+Patch26142: Revert-cpupower-Makefile-change-to-help-run-the-tool.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1366,6 +1369,9 @@ ApplyPatch security-yama-Remove-unnecessary-selects-from-Kconfi.patch
ApplyPatch mfd-rtsx_usb-prevent-DMA-from-stack.patch
+#rhbz 1199312
+ApplyPatch Revert-cpupower-Makefile-change-to-help-run-the-tool.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2225,6 +2231,7 @@ fi
%changelog
* Wed Mar 11 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc3.git1.1
- Linux v4.0-rc3-111-gaffb8172de39
+- Revert commit that added bad rpath to cpupower (rhbz 1199312)
- Reenable debugging options.
* Mon Mar 09 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc3.git0.1