From dc19b1dee8a8579b1fd3dc305a270bb7f5d4df48 Mon Sep 17 00:00:00 2001 From: qhw01063182 Date: Wed, 17 Sep 2025 18:10:22 +0800 Subject: [PATCH 1/3] [BUG]update to kpatch-0.9.7-3 Signed-off-by: qhw01063182 --- ...onfirm-prompt-when-unloading-patches.patch | 25 ------------------- dist | 2 +- download | 2 +- kpatch-0.9.4-sw.patch | 14 ----------- kpatch.spec | 16 +++--------- 5 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 0004-remove-confirm-prompt-when-unloading-patches.patch delete mode 100644 kpatch-0.9.4-sw.patch diff --git a/0004-remove-confirm-prompt-when-unloading-patches.patch b/0004-remove-confirm-prompt-when-unloading-patches.patch deleted file mode 100644 index d90dba2..0000000 --- a/0004-remove-confirm-prompt-when-unloading-patches.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 51808080d474112f3206a7aad94930d274c248e2 Mon Sep 17 00:00:00 2001 -From: "zhangyongde.zyd" -Date: Fri, 24 Feb 2023 17:36:20 +0800 -Subject: [PATCH] remove confirm prompt when unloading patches - ---- - kpatch/kpatch | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kpatch/kpatch b/kpatch/kpatch -index 7506a05..aafa938 100755 ---- a/kpatch/kpatch -+++ b/kpatch/kpatch -@@ -470,7 +470,7 @@ case "$1" in - shift - ;; - "unload") -- confirm_prompt "WARNING: Red Hat doesn't support unloading of kpatches, continue anyway?" || exit 1 -+ echo "WARNING: Anolis don't suggest unloading of kpatches." || exit 1 - ;; - esac - --- -2.37.0 (Apple Git-136) - diff --git a/dist b/dist index 9c0e36e..1fe92cf 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8 +an8_10 diff --git a/download b/download index 45aade7..c9b6f89 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -21d48a6aa2ff4f3afd934f7fced99018 kpatch-dnf-v0.4.tar.gz 5e876cf28fc419ee72526a5ae26d59b0 v0.9.7.tar.gz +0b40d0d2ed4b11c5843b675396d784fc kpatch-dnf-v0.5.tar.gz diff --git a/kpatch-0.9.4-sw.patch b/kpatch-0.9.4-sw.patch deleted file mode 100644 index 956aa75..0000000 --- a/kpatch-0.9.4-sw.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur kpatch-0.9.4.org/kpatch-build/Makefile kpatch-0.9.4.sw/kpatch-build/Makefile ---- kpatch-0.9.4.org/kpatch-build/Makefile 2021-08-27 03:31:07.000000000 +0800 -+++ kpatch-0.9.4.sw/kpatch-build/Makefile 2023-06-13 11:09:25.078312975 +0800 -@@ -14,6 +14,10 @@ - SOURCES += insn/insn.c insn/inat.c - INSN = insn/insn.o insn/inat.o - insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS)) -+else ifeq ($(ARCH),sw_64) -+SOURCES += insn/insn.c insn/inat.c -+INSN = insn/insn.o insn/inat.o -+insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS)) - else ifeq ($(ARCH),ppc64le) - SOURCES += gcc-plugins/ppc64le-plugin.c - PLUGIN = gcc-plugins/ppc64le-plugin.so diff --git a/kpatch.spec b/kpatch.spec index cdde36d..e0749fc 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,9 +1,8 @@ -%define kpatch_dnf_ver 0.4 -%define anolis_release .0.2 +%define kpatch_dnf_ver 0.5 Name: kpatch Version: 0.9.7 -Release: 2%{anolis_release}%{?dist} +Release: 3%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -16,14 +15,12 @@ Source1: kpatch-dnf-v%{kpatch_dnf_ver}.tar.gz Patch0: 0001-contrib-disable-upstart-kpatch.conf-install.patch Patch1: 0002-kpatch-clarify-unload-unsupport.patch Patch2: 0003-do-not-rm-selinux-rpm-owned-directory.patch -Patch3: 0004-remove-confirm-prompt-when-unloading-patches.patch # Upstream backports #Patch100: 0100-xxx.patch # kpatch-dnf backports #Patch200: 0200-xxx.patch -Patch1000: kpatch-0.9.4-sw.patch Requires: bash kmod binutils Recommends: kpatch-dnf @@ -54,8 +51,6 @@ kpatch-patch packages updates. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch1000 -p1 %setup -D -T -a 1 cd kpatch-dnf-%{kpatch_dnf_ver} @@ -92,11 +87,8 @@ echo "To enable automatic kpatch-patch subscription, run:" echo -e "\t$ dnf kpatch auto" %changelog -* Tue Jun 13 2023 wuxiat 0.9.7-2.0.2 -- cherry-pick `add sw Patch #b079c9f333b91124926dd10c7aaf035eccc033a2`. - -* Tue Jul 04 2023 Yongde Zhang 0.9.7-2.0.1 -- Disable confirm prompt of kpatch script which may have nagative effect of unloading process +* Tue Apr 08 2025 Rado Vrbovsky 0.9.7-3 +- Rebase kpatch DNF plugin with upstream to 0.5 (RHEL-85574) * Wed Nov 16 2022 Yannick Cote 0.9.7-2 - augment kpatch-dnf package versioning to satisfy build (rhbz#2121211) -- Gitee From d6406f655c6cfdb70c7714484660d634c82e2b7a Mon Sep 17 00:00:00 2001 From: "zhangyongde.zyd" Date: Mon, 6 Mar 2023 12:34:22 +0800 Subject: [PATCH 2/3] remove confirm prompt when unloading patches --- ...onfirm-prompt-when-unloading-patches.patch | 25 +++++++++++++++++++ kpatch.spec | 7 ++++++ 2 files changed, 32 insertions(+) create mode 100644 1000-remove-confirm-prompt-when-unloading-patches.patch diff --git a/1000-remove-confirm-prompt-when-unloading-patches.patch b/1000-remove-confirm-prompt-when-unloading-patches.patch new file mode 100644 index 0000000..d90dba2 --- /dev/null +++ b/1000-remove-confirm-prompt-when-unloading-patches.patch @@ -0,0 +1,25 @@ +From 51808080d474112f3206a7aad94930d274c248e2 Mon Sep 17 00:00:00 2001 +From: "zhangyongde.zyd" +Date: Fri, 24 Feb 2023 17:36:20 +0800 +Subject: [PATCH] remove confirm prompt when unloading patches + +--- + kpatch/kpatch | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kpatch/kpatch b/kpatch/kpatch +index 7506a05..aafa938 100755 +--- a/kpatch/kpatch ++++ b/kpatch/kpatch +@@ -470,7 +470,7 @@ case "$1" in + shift + ;; + "unload") +- confirm_prompt "WARNING: Red Hat doesn't support unloading of kpatches, continue anyway?" || exit 1 ++ echo "WARNING: Anolis don't suggest unloading of kpatches." || exit 1 + ;; + esac + +-- +2.37.0 (Apple Git-136) + diff --git a/kpatch.spec b/kpatch.spec index e0749fc..480add9 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,8 +1,10 @@ +%define anolis_release .0.1 %define kpatch_dnf_ver 0.5 Name: kpatch Version: 0.9.7 Release: 3%{?dist} +Release: 3%{anolis_release}%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -15,6 +17,7 @@ Source1: kpatch-dnf-v%{kpatch_dnf_ver}.tar.gz Patch0: 0001-contrib-disable-upstart-kpatch.conf-install.patch Patch1: 0002-kpatch-clarify-unload-unsupport.patch Patch2: 0003-do-not-rm-selinux-rpm-owned-directory.patch +Patch1000: 1000-remove-confirm-prompt-when-unloading-patches.patch # Upstream backports #Patch100: 0100-xxx.patch @@ -51,6 +54,7 @@ kpatch-patch packages updates. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch1000 -p1 %setup -D -T -a 1 cd kpatch-dnf-%{kpatch_dnf_ver} @@ -87,6 +91,9 @@ echo "To enable automatic kpatch-patch subscription, run:" echo -e "\t$ dnf kpatch auto" %changelog +* Wed Sep 17 2025 Yongde Zhang 0.9.7-3.0.1 +- Disable confirm prompt of kpatch script which may have nagative effect of unloading process + * Tue Apr 08 2025 Rado Vrbovsky 0.9.7-3 - Rebase kpatch DNF plugin with upstream to 0.5 (RHEL-85574) -- Gitee From 91858b991005977985770d103d95c372a5570688 Mon Sep 17 00:00:00 2001 From: wxiat Date: Tue, 13 Jun 2023 11:14:06 +0800 Subject: [PATCH 3/3] sw-20230613 Signed-off-by: Weisson --- 1001-kpatch-0.9.4-sw.patch | 16 ++++++++++++++++ kpatch.spec | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 1001-kpatch-0.9.4-sw.patch diff --git a/1001-kpatch-0.9.4-sw.patch b/1001-kpatch-0.9.4-sw.patch new file mode 100644 index 0000000..0fc012a --- /dev/null +++ b/1001-kpatch-0.9.4-sw.patch @@ -0,0 +1,16 @@ +diff -Naur kpatch-0.9.7/kpatch-build/Makefile kpatch-0.9.7.sw/kpatch-build/Makefile +--- kpatch-0.9.7/kpatch-build/Makefile 2021-08-27 03:31:07.000000000 +0800 ++++ kpatch-0.9.7/kpatch-build/Makefile 2023-06-13 11:09:25.078312975 +0800 +@@ -13,7 +13,11 @@ + SOURCES += insn/insn.c insn/inat.c + INSN = insn/insn.o insn/inat.o + insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS)) +-ifeq ($(ARCH),ppc64le) ++ifeq ($(ARCH),sw_64) ++SOURCES += insn/insn.c insn/inat.c ++INSN = insn/insn.o insn/inat.o ++insn/%.o: CFLAGS := $(filter-out -Wconversion, $(CFLAGS)) ++else ($(ARCH),ppc64le) + SOURCES += gcc-plugins/ppc64le-plugin.c + PLUGIN = gcc-plugins/ppc64le-plugin.so + TARGETS += $(PLUGIN) diff --git a/kpatch.spec b/kpatch.spec index 480add9..01a1524 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -3,7 +3,6 @@ Name: kpatch Version: 0.9.7 -Release: 3%{?dist} Release: 3%{anolis_release}%{?dist} Summary: Dynamic kernel patch manager @@ -24,6 +23,7 @@ Patch1000: 1000-remove-confirm-prompt-when-unloading-patches.patch # kpatch-dnf backports #Patch200: 0200-xxx.patch +Patch1001: 1001-kpatch-0.9.4-sw.patch Requires: bash kmod binutils Recommends: kpatch-dnf @@ -55,6 +55,7 @@ kpatch-patch packages updates. %patch1 -p1 %patch2 -p1 %patch1000 -p1 +%patch1001 -p1 %setup -D -T -a 1 cd kpatch-dnf-%{kpatch_dnf_ver} @@ -93,6 +94,7 @@ echo -e "\t$ dnf kpatch auto" %changelog * Wed Sep 17 2025 Yongde Zhang 0.9.7-3.0.1 - Disable confirm prompt of kpatch script which may have nagative effect of unloading process +- cherry-pick `add sw Patch #b079c9f333b91124926dd10c7aaf035eccc033a2`. * Tue Apr 08 2025 Rado Vrbovsky 0.9.7-3 - Rebase kpatch DNF plugin with upstream to 0.5 (RHEL-85574) -- Gitee