commit fc08a7a154ce2b0f702c303bd77e8c9f464204f8 Author: Arkadiusz MiĆkiewicz <ar...@maven.pl> Date: Wed Nov 15 13:32:35 2017 +0100
- rel 4; orc unwinder exists only for x8664/x32 kernel.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- diff --git a/kernel.spec b/kernel.spec index 620e7205..1a44e1e5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -68,7 +68,7 @@ %define have_pcmcia 0 %endif -%define rel 3 +%define rel 4 %define basever 4.14 %define postver .0 @@ -1013,10 +1013,12 @@ for dir in $(cd %{objdir} && find arch -name generated -type d); do find $RPM_BUILD_ROOT%{_kernelsrcdir}/$dir -name '.*.cmd' -exec rm "{}" ";" done +%ifarch %{x8664} x32 # 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 +%endif # version.h location changed in 3.7, but a lot of external modules don't know about it # add a compatibility symlink @@ -1419,8 +1421,10 @@ fi %{_kernelsrcdir}/scripts/selinux/mdp/*.c %exclude %dir %{_kernelsrcdir}/security %exclude %dir %{_kernelsrcdir}/security/selinux +%ifarch %{x8664} x32 %attr(755,root,root) %{_kernelsrcdir}/tools/objtool/fixdep %attr(755,root,root) %{_kernelsrcdir}/tools/objtool/objtool +%endif %if %{with doc} %files doc @@ -1497,8 +1501,10 @@ fi %{_kernelsrcdir}/security %exclude %{_kernelsrcdir}/security/selinux/include %{_kernelsrcdir}/tools/* +%ifarch %{x8664} x32 %exclude %{_kernelsrcdir}/tools/objtool/fixdep %exclude %{_kernelsrcdir}/tools/objtool/objtool +%endif %{_kernelsrcdir}/usr %{_kernelsrcdir}/COPYING %{_kernelsrcdir}/CREDITS ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/fc08a7a154ce2b0f702c303bd77e8c9f464204f8 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit