summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@redhat.com>2018-05-03 14:18:04 -0700
committerLaura Abbott <labbott@redhat.com>2018-05-04 13:17:32 -0700
commitf3815df024793979e4b5fffcb123675f5bbb4f21 (patch)
tree3aa3e8e44565f9b5e133cb5c6cc1f973c60a9869
parent68c66807db77453926fbfbedae3bee348c2c876c (diff)
downloadkernel-f3815df024793979e4b5fffcb123675f5bbb4f21.tar.gz
kernel-f3815df024793979e4b5fffcb123675f5bbb4f21.tar.xz
kernel-f3815df024793979e4b5fffcb123675f5bbb4f21.zip
Fix for building out of tree modules on powerpc (rhbz 1574604)
-rw-r--r--kernel.spec8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index af6dbc139..05da96357 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1398,6 +1398,9 @@ BuildKernel() {
if [ -f arch/$Arch/*lds ]; then
cp -a arch/$Arch/*lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/arch/%{_arch}/ || :
fi
+ if [ -f arch/%{asmarch}/kernel/module.lds ]; then
+ cp -a --parents arch/%{asmarch}/kernel/module.lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
+ fi
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*.o
rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/*/*.o
%ifarch %{power64}
@@ -1407,8 +1410,6 @@ BuildKernel() {
cp -a --parents arch/%{asmarch}/include $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
fi
%ifarch aarch64
- # Needed for systemtap
- cp -a --parents arch/arm64/kernel/module.lds $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
# arch/arm64/include/asm/xen references arch/arm
cp -a --parents arch/arm/include/asm/xen $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/
# arch/arm64/include/asm/opcodes.h references arch/arm
@@ -1918,6 +1919,9 @@ fi
#
#
%changelog
+* Fri May 04 2018 Laura Abbott <labbott@redhat.com>
+- Fix for building out of tree modules on powerpc (rhbz 1574604)
+
* Fri May 04 2018 Justin M. Forbes <jforbes@fedoraproject.org>
- Fix CVE-2018-10322 (rhbz 1571623 1571624)
- Fix CVE-2018-10323 (rhbz 1571627 1571630)