diff options
| author | Laura Abbott <labbott@redhat.com> | 2019-10-31 17:08:49 -0400 |
|---|---|---|
| committer | Laura Abbott <labbott@redhat.com> | 2019-11-01 16:18:24 -0400 |
| commit | 15d025ac3c4ca626ee1ea67cdaaa19c9b51d8432 (patch) | |
| tree | 319b70b7cf3f9993dc38df670a05605d4e5825b7 | |
| parent | b8d58e29083fa8374b4b37e0b5e032ec29104869 (diff) | |
| download | kernel-15d025ac3c4ca626ee1ea67cdaaa19c9b51d8432.tar.gz kernel-15d025ac3c4ca626ee1ea67cdaaa19c9b51d8432.tar.xz kernel-15d025ac3c4ca626ee1ea67cdaaa19c9b51d8432.zip | |
Align on kernel-devel
We don't actually need to be packaging most of these files so
switch to a smaller subset.
| -rw-r--r-- | kernel.spec | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/kernel.spec b/kernel.spec index d2b44e420..c34d8372b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1279,8 +1279,6 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \ scripts/show_delta \ scripts/diffconfig \ scripts/bloat-o-meter \ - scripts/tracing/draw_functrace.py \ - scripts/spdxcheck.py \ tools/perf/tests/attr.py \ tools/perf/scripts/python/stat-cpi.py \ tools/perf/scripts/python/sched-migration.py \ @@ -1689,18 +1687,10 @@ 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 + rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/tracing + rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py 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} || : @@ -1736,7 +1726,7 @@ BuildKernel() { %endif cp -a include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include -%ifarch %{ix86} x86_64 +%ifarch i686 x86_64 # files for 'make prepare' to succeed with kernel-devel cp -a --parents arch/x86/entry/syscalls/syscall_32.tbl $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/entry/syscalls/syscalltbl.sh $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ @@ -1747,9 +1737,7 @@ 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/ - # 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 tools/include/tools/le_byteshift.h $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/stack.S $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ cp -a --parents arch/x86/purgatory/setup-x86_64.S $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/ |