[packages/kernel] - rel 3; bring orc unwinder back (https://lwn.net/Articles/727553/)
arekm
arekm at pld-linux.org
Tue Nov 14 10:03:13 CET 2017
commit dc2ad284a49345a28ce96ea10617e926acb96993
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Nov 14 10:03:04 2017 +0100
- rel 3; bring orc unwinder back (https://lwn.net/Articles/727553/)
kernel-multiarch.config | 6 +++---
kernel.spec | 11 ++++++++++-
2 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 75382e05..620e7205 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
%define have_pcmcia 0
%endif
-%define rel 2
+%define rel 3
%define basever 4.14
%define postver .0
@@ -1013,6 +1013,11 @@ for dir in $(cd %{objdir} && find arch -name generated -type d); do
find $RPM_BUILD_ROOT%{_kernelsrcdir}/$dir -name '.*.cmd' -exec rm "{}" ";"
done
+# Needed for CONFIG_STACK_VALIDATION / ORC_UNWINDER enabled builds
+install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/tools/objtool
+cp -a %{objdir}/tools/objtool/fixdep $RPM_BUILD_ROOT%{_kernelsrcdir}/tools/objtool
+cp -a %{objdir}/tools/objtool/objtool $RPM_BUILD_ROOT%{_kernelsrcdir}/tools/objtool
+
# version.h location changed in 3.7, but a lot of external modules don't know about it
# add a compatibility symlink
ln -s ../generated/uapi/linux/version.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/version.h
@@ -1414,6 +1419,8 @@ fi
%{_kernelsrcdir}/scripts/selinux/mdp/*.c
%exclude %dir %{_kernelsrcdir}/security
%exclude %dir %{_kernelsrcdir}/security/selinux
+%attr(755,root,root) %{_kernelsrcdir}/tools/objtool/fixdep
+%attr(755,root,root) %{_kernelsrcdir}/tools/objtool/objtool
%if %{with doc}
%files doc
@@ -1490,6 +1497,8 @@ fi
%{_kernelsrcdir}/security
%exclude %{_kernelsrcdir}/security/selinux/include
%{_kernelsrcdir}/tools/*
+%exclude %{_kernelsrcdir}/tools/objtool/fixdep
+%exclude %{_kernelsrcdir}/tools/objtool/objtool
%{_kernelsrcdir}/usr
%{_kernelsrcdir}/COPYING
%{_kernelsrcdir}/CREDITS
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index a90ed234..50ced2a5 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -14,7 +14,7 @@ EARLY_PRINTK_EFI all=n
EARLY_PRINTK_USB_XDBC all=n
EFI_MIXED all=y
EFI_PGT_DUMP all=n
-FRAME_POINTER_UNWINDER all=y
+FRAME_POINTER_UNWINDER all=n
GCC_PLUGINS all=y
GCC_PLUGIN_CYC_COMPLEXITY all=n
GCC_PLUGIN_LATENT_ENTROPY all=n
@@ -31,7 +31,7 @@ IOSF_MBI_DEBUG all=y
KEXEC_FILE all=y
KEXEC_VERIFY_SIG all=n
KVM_DEBUG_FS all=n
-ORC_UNWINDER all=n
+ORC_UNWINDER all=y
PERF_EVENTS_AMD_POWER all=m
PERF_EVENTS_INTEL_CSTATE all=m
PERF_EVENTS_INTEL_RAPL all=m
@@ -10172,7 +10172,7 @@ HEADERS_CHECK all=y
DEBUG_SECTION_MISMATCH all=n
SECTION_MISMATCH_WARN_ONLY all=y
FRAME_POINTER i386=y x86_64=y
-STACK_VALIDATION all=n
+STACK_VALIDATION all=y
DEBUG_FORCE_WEAK_PER_CPU all=n
MAGIC_SYSRQ all=y
MAGIC_SYSRQ_DEFAULT_ENABLE all=0x1
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/dc2ad284a49345a28ce96ea10617e926acb96993
More information about the pld-cvs-commit
mailing list