From 803c5b964daca775fc5430f37557f60dc36a075f Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 30 Mar 2016 13:50:01 -0400 Subject: [PATCH] Make sure to install objtool in -devel subpackage if it exists (rhbz 1321628) --- kernel.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index ba566cf87..1295b9de2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 3 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -1454,6 +1454,9 @@ BuildKernel() { rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + if [ -f tools/objtool/objtool ]; then + cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/objtool/ || : + fi if [ -d arch/$Arch/scripts ]; then cp -a arch/$Arch/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || : fi @@ -2158,6 +2161,9 @@ fi # # %changelog +* Wed Mar 30 2016 Josh Boyer +- Make sure to install objtool in -devel subpackage if it exists (rhbz 1321628) + * Wed Mar 30 2016 Peter Robinson - Add ARMv7 mvebu fixes headed upstream - Minor ARMv7 cleanups