summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Rękorajski2016-06-06 06:34:52 (GMT)
committerJan Rękorajski2016-06-06 06:34:52 (GMT)
commitb423f93fd07e6d0295532d1a85c27461c0c57dd2 (patch)
tree91d9203582d1b8929e85c683737d707764c83041
parentfa7ff97ef9ce1901420dab4cf2d79a0d219f788b (diff)
downloadkernel-b423f93fd07e6d0295532d1a85c27461c0c57dd2.zip
kernel-b423f93fd07e6d0295532d1a85c27461c0c57dd2.tar.gz
- disabled CONFIG_STACK_VALIDATION, it's only usefull on debug,auto/th/kernel-nopae-4.6.1-3auto/th/kernel-4.6.1-3
frame-pointer enabled builds - rel 3
-rw-r--r--kernel-multiarch.config2
-rw-r--r--kernel.spec11
2 files changed, 2 insertions, 11 deletions
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index def5704..0d855f9 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -9261,7 +9261,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=y
+STACK_VALIDATION all=n
DEBUG_FORCE_WEAK_PER_CPU all=n
MAGIC_SYSRQ all=y
MAGIC_SYSRQ_DEFAULT_ENABLE all=0x1
diff --git a/kernel.spec b/kernel.spec
index d28a55e..4374a03 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
%define have_pcmcia 0
%endif
-%define rel 2
+%define rel 3
%define basever 4.6
%define postver .1
@@ -1048,11 +1048,6 @@ 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 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
@@ -1473,8 +1468,6 @@ 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
@@ -1554,8 +1547,6 @@ 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