Let 'make prepare' succeed with kernel-devel
Due to a few missing files, running 'make prepare' on the kernel-devel sources will fail. This isn't a huge issue but can lead to confusion for users who are trying to follow tutorials elsewhere that may mention running make prepare. Copy the necessary files over to the devel package.
This commit is contained in:
parent
f3d56fd90e
commit
19c3eb680a
31
kernel.spec
31
kernel.spec
@ -1422,9 +1422,35 @@ BuildKernel() {
|
|||||||
if [ -d arch/%{asmarch}/mach-${Flavour}/include ]; then
|
if [ -d arch/%{asmarch}/mach-${Flavour}/include ]; then
|
||||||
cp -a --parents arch/%{asmarch}/mach-${Flavour}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
cp -a --parents arch/%{asmarch}/mach-${Flavour}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
fi
|
fi
|
||||||
|
# include a few files for 'make prepare'
|
||||||
|
cp -a --parents arch/arm/tools/gen-mach-types $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/arm/tools/mach-types $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
cp -a include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
|
cp -a include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
|
||||||
|
%ifarch %{ix86} 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/
|
||||||
|
cp -a --parents arch/x86/entry/syscalls/syscallhdr.sh $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/entry/syscalls/syscall_64.tbl $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/tools/relocs_32.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/tools/relocs_64.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
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/
|
||||||
|
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/
|
||||||
|
cp -a --parents arch/x86/purgatory/stack.S $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/purgatory/string.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/purgatory/setup-x86_64.S $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/purgatory/entry64.S $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/boot/string.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/boot/string.c $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
cp -a --parents arch/x86/boot/ctype.h $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
|
||||||
|
%endif
|
||||||
# Make sure the Makefile and version.h have a matching timestamp so that
|
# Make sure the Makefile and version.h have a matching timestamp so that
|
||||||
# external modules can be built
|
# external modules can be built
|
||||||
touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/generated/uapi/linux/version.h
|
touch -r $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Makefile $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include/generated/uapi/linux/version.h
|
||||||
@ -2043,6 +2069,9 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 9 2016 Laura Abbott <labbott@fedoraproject.org>
|
||||||
|
- Let 'make prepare' succeed with kernel-devel
|
||||||
|
|
||||||
* Tue Feb 9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 4.5.0-0.rc3.git0.2
|
* Tue Feb 9 2016 Peter Robinson <pbrobinson@fedoraproject.org> 4.5.0-0.rc3.git0.2
|
||||||
- Fix Power64 kernel build
|
- Fix Power64 kernel build
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user