From 4f446b16a233c5b599f12f8560bf02d4ad7e1d42 Mon Sep 17 00:00:00 2001
From: Evgenii Shatokhin <eshatokhin@virtuozzo.com>
Date: Sat, 7 Mar 2020 19:46:37 +0300
Subject: [PATCH] Fix objtool-related errors in 'make prepare' for devel
 packages

---
 kernel.spec                                   |  5 ++-
 ...heck.sh-set-the-exit-code-explicitly.patch | 32 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 objtool-sync-check.sh-set-the-exit-code-explicitly.patch

diff --git a/kernel.spec b/kernel.spec
index 367859c..9c8b118 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,7 +4,7 @@
 %define sublevel	24
 
 # Release number. Increase this before a rebuild.
-%define rpmrel		1
+%define rpmrel		2
 %define fullrpmrel	%{rpmrel}
 
 %define rpmtag		%{disttag}
@@ -179,6 +179,9 @@ Patch105:	perf-silence-format-warnings-gcc8.patch
 
 # AUFS from http://aufs.sourceforge.net/
 Patch109:	fs-aufs.patch
+
+# Other patches
+Patch110:	objtool-sync-check.sh-set-the-exit-code-explicitly.patch
 ####################################################################
 
 Autoreqprov: 	no
diff --git a/objtool-sync-check.sh-set-the-exit-code-explicitly.patch b/objtool-sync-check.sh-set-the-exit-code-explicitly.patch
new file mode 100644
index 0000000..c267232
--- /dev/null
+++ b/objtool-sync-check.sh-set-the-exit-code-explicitly.patch
@@ -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
+