Djam/kernel-5.10
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/kernel-5.10.git synced 2025-02-24 17:22:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix objtool-related errors in 'make prepare' for devel packages

Browse source 
Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
This commit is contained in:
Evgenii Shatokhin 2020-03-07 19:46:37 +03:00 • committed by Mikhail Novosyolov
parent 974fbb224c
commit caad8bc737
2 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kernel.spec
View file

@ -11,7 +11,7 @@
%define sublevel 25
# Release number. Increase this before a rebuild.
%define rpmrel 1
%define rpmrel 2
%define fullrpmrel %{rpmrel}
%define rpmtag %{disttag}
@ -208,8 +208,9 @@ Patch102: audit-make-it-less-verbose.patch
# AUFS from http://aufs.sourceforge.net/
Patch109: fs-aufs.patch
# Other patches
Patch110: objtool-sync-check.sh-set-the-exit-code-explicitly.patch
Patch200: WIP-Sign-modules-with-GOST-by-LibreSSL.patch
####################################################################
# Disable AutoReq
AutoReq: 0

32
objtool-sync-check.sh-set-the-exit-code-explicitly.patch Normal file
View file

@ -0,0 +1,32 @@
From 6b70660e7d730b1ef79360ba7c23fc9f1d4b60e3 Mon Sep 17 00:00:00 2001
From: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
Date: Sat, 7 Mar 2020 19:23:40 +0300
Subject: [PATCH] objtool/sync-check.sh: set the exit code explicitly
Commit 6ec14aa7a58a "objtool: Silence build output" removed 'cd -' from
the end of sync-check.sh script. As a side-effect, the script now exits
with the exit code of the last executed 'check' command. If any of the
files it should check are missing (which is not an error per se), it will
return 1 and objtool will fail to build.
Explicit 'exit 0' at the end should fix that.
Fixes: 6ec14aa7a58a "objtool: Silence build output"
Signed-off-by: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
---
tools/objtool/sync-check.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/objtool/sync-check.sh b/tools/objtool/sync-check.sh
index 2a1261bfbb62..f23bd02c1b77 100755
--- a/tools/objtool/sync-check.sh
+++ b/tools/objtool/sync-check.sh
@@ -48,3 +48,5 @@ check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[
check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"'
check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"'
check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]"'
+
+exit 0
--
2.24.0