From 38df441da3ce76ecb3d8cf911382b6e3568564e0 Mon Sep 17 00:00:00 2001 From: Xie XiuQi Date: Sun, 29 Jan 2023 10:41:08 +0800 Subject: [PATCH] kernel.spec: fix missing objtool After this commit, we should use check CONFIG_OBJTOOL instead of CONFIG_STACK_VALIDATION.. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=03f16cd020eb8bb2eb837e2090086f296a9fa91d objtool: Add CONFIG_OBJTOOL Now that stack validation is an optional feature of objtool, add CONFIG_OBJTOOL and replace most usages of CONFIG_STACK_VALIDATION with it. CONFIG_STACK_VALIDATION can now be considered to be frame-pointer specific. CONFIG_UNWINDER_ORC is already inherently valid for live patching, so no need to "validate" it. Signed-off-by: Josh Poimboeuf Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Miroslav Benes Link: https://lkml.kernel.org/r/939bf3d85604b2a126412bf11af6e3bd3b872bcb.1650300597.git.jpoimboe@redhat.com Signed-off-by: Xie XiuQi --- kernel.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index b6c9659..fc01725 100644 --- a/kernel.spec +++ b/kernel.spec @@ -12,7 +12,7 @@ %global upstream_sublevel 6 %global devel_release 1 %global maintenance_release .0.0 -%global pkg_release .3 +%global pkg_release .4 %define with_debuginfo 0 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -589,7 +589,7 @@ fi %endif # copy objtool for kernel-devel (needed for building external modules) -if grep -q CONFIG_STACK_VALIDATION=y .config; then +if grep -q CONFIG_OBJTOOL=y .config; then mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/tools/objtool cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/tools/objtool fi @@ -882,6 +882,9 @@ fi %endif %changelog +* Sun Jan 29 2023 Xie XiuQi - 6.1.6-1.0.0.4 +- fix missing objtool + * Tue Jan 17 2023 Xie XiuQi - 6.1.6-1.0.0.3 - update to v6.1.6