summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-09-23 13:15:19 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-09-23 13:15:19 +0200
commit981904b9f370d02e32223acc11465d6920100fa7 (patch)
tree982f588c7dfebf66b4b0402a309d1375ac87ce3c
parentedcea1d4f9f0a5221b6834450c065a8fffd29ca0 (diff)
parent9f2a885abcebddd659a74513ac5e0a96c87d2793 (diff)
downloadkernel-981904b9f370d02e32223acc11465d6920100fa7.tar.gz
kernel-981904b9f370d02e32223acc11465d6920100fa7.tar.xz
kernel-981904b9f370d02e32223acc11465d6920100fa7.zip
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
-rw-r--r--kernel.spec9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 23b078155..d10e66c31 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1997,6 +1997,15 @@ BuildKernel() {
cp -a scripts $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/tracing
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py
+
+ # Files for 'make scripts' to succeed with kernel-devel.
+ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/security/selinux/include
+ cp -a --parents security/selinux/include/classmap.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ cp -a --parents security/selinux/include/initial_sid_to_string.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/tools/include/tools
+ cp -a --parents tools/include/tools/be_byteshift.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
+ cp -a --parents tools/include/tools/le_byteshift.h $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