summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2018-03-01 17:35:33 -0800
committerLaura Abbott <labbott@redhat.com>2018-03-01 17:37:39 -0800
commit382c374e18cc3acc671a2ea6e8f2573ef8f622f5 (patch)
treeabfe16d76fffbe12a0c8f599bcde1000bdbd93ba
parente4f82ef926050fc7e976ba8ce302366bd0061ea0 (diff)
downloadkernel-382c374e18cc3acc671a2ea6e8f2573ef8f622f5.tar.gz
kernel-382c374e18cc3acc671a2ea6e8f2573ef8f622f5.tar.xz
kernel-382c374e18cc3acc671a2ea6e8f2573ef8f622f5.zip
Fix "make prepare"
Copy a bunch more files (mostly related to objtool) to let "make prepare" succeed.
-rw-r--r--kernel.spec14
1 files changed, 13 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index a4fb76c48..973bf78ad 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1382,6 +1382,16 @@ BuildKernel() {
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/ || :
+ # these are a few files associated with objtool
+ cp -a --parents tools/build/Build.include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/scripts/utilities.mak $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ # also more than necessary but it's not that many more files
+ cp -a --parents tools/objtool/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/lib/str_error_r.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/lib/string.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ cp -a --parents tools/lib/subcmd/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
fi
if [ -d arch/$Arch/scripts ]; then
cp -a arch/$Arch/scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch} || :
@@ -1427,7 +1437,9 @@ BuildKernel() {
cp -a --parents arch/x86/tools/relocs.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/tools/relocs_common.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/tools/relocs.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
- cp -a --parents tools/include/tools/le_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ # Yes this is more includes than we probably need. Feel free to sort out
+ # dependencies if you so choose.
+ cp -a --parents tools/include/* $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/purgatory/purgatory.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/purgatory/sha256.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
cp -a --parents arch/x86/purgatory/sha256.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/