import kpatch-0.6.1-6.el8

SOURCES/0005-Fix-livepatch-enabled-kernel-detection-in-kpatch-scr.patch

@@ -0,0 +1,29 @@
+From 54c3d6d8fef188da10a5040c9cc841f35e01bfbf Mon Sep 17 00:00:00 2001
+From: Artem Savkov <asavkov@redhat.com>
+Date: Tue, 7 May 2019 14:12:38 +0200
+Subject: [PATCH] Fix livepatch-enabled kernel detection in kpatch script
+
+We can no longer use klp_register_patch symbol to determine if the
+kernel is livepatch-enabled. Use klp_enable_patch instead.
+
+Signed-off-by: Artem Savkov <asavkov@redhat.com>
+---
+ kpatch/kpatch | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kpatch/kpatch b/kpatch/kpatch
+index 1d9f90c..bdceff1 100755
+--- a/kpatch/kpatch
++++ b/kpatch/kpatch
+@@ -126,7 +126,7 @@ find_core_module() {
+ }
+ 
+ core_loaded () {
+-	grep -q -e "T klp_register_patch" -e "T kpatch_register" /proc/kallsyms
++	grep -q -e "T klp_enable_patch" -e "T kpatch_register" /proc/kallsyms
+ }
+ 
+ get_module_name () {
+-- 
+2.21.0
+

SPECS/kpatch.spec

@@ -1,6 +1,6 @@
 Name:		kpatch
 Version:	0.6.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Dynamic kernel patch manager
 
 Group:		System Environment/Kernel
@@ -11,6 +11,7 @@ Patch0:		0001-contrib-disable-upstart-kpatch.conf-install.patch
 Patch1:		0002-contrib-service-don-t-unload-modules-on-stop.patch
 Patch2:		0003-kpatch-script-don-t-fail-if-module-already-loaded-en.patch
 Patch3:		0004-kpatch-clarify-unload-unsupport.patch
+Patch4:		0005-Fix-livepatch-enabled-kernel-detection-in-kpatch-scr.patch
 
 Requires:	bash kmod binutils
 
@@ -29,6 +30,7 @@ patch the kernel without rebooting.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 
 %build
@@ -49,6 +51,9 @@ rm -f %{buildroot}/usr/share/man/man1/kpatch-build.1.gz
 
 
 %changelog
+* Tue Oct 22 2019 Yannick Cote <ycote@redhat.com> 0.6.1-6
+- fix patch loading issue caused by recent kernel rebase (rhbz#1754679)
+
 * Wed Aug 28 2019 Joe Lawrence <joe.lawrence@redhat.com> 0.6.1-5
 - kpatch: clarify that "kpatch unload" isn't supported (rhbz#1746461)