From 2354b22bb52ffa9c42a8f697f0e0e5a9803b0b1d Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Tue, 4 Jul 2023 21:04:56 +0800 Subject: [PATCH 1/2] update to kpatch-0.9.7-2.el8.src.rpm Signed-off-by: Zhao Hang --- ...onfirm-prompt-when-unloading-patches.patch | 25 ------------------- download | 2 +- kpatch.spec | 15 ++++++----- 3 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 0004-remove-confirm-prompt-when-unloading-patches.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/download b/download index 5b21263..45aade7 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ 21d48a6aa2ff4f3afd934f7fced99018 kpatch-dnf-v0.4.tar.gz -f38426f46e798bcc8fccdb7ec1c5ae14 v0.9.4.tar.gz +5e876cf28fc419ee72526a5ae26d59b0 v0.9.7.tar.gz diff --git a/kpatch.spec b/kpatch.spec index 92cf82a..97bc6d9 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,9 +1,8 @@ %define kpatch_dnf_ver 0.4 -%define anolis_release .0.1 Name: kpatch -Version: 0.9.4 -Release: 3%{anolis_release}%{?dist} +Version: 0.9.7 +Release: 2%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -16,7 +15,6 @@ 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 @@ -38,7 +36,7 @@ patch the kernel without rebooting. %package -n kpatch-dnf Summary: kpatch-patch manager plugin for DNF -Version: %kpatch_dnf_ver +Version: %{version}_%{kpatch_dnf_ver} BuildRequires: python3-devel python3-dnf Requires: python3-dnf python3-hawkey Provides: kpatch-dnf @@ -53,7 +51,6 @@ kpatch-patch packages updates. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %setup -D -T -a 1 cd kpatch-dnf-%{kpatch_dnf_ver} @@ -90,9 +87,11 @@ echo "To enable automatic kpatch-patch subscription, run:" echo -e "\t$ dnf kpatch auto" %changelog +* Wed Nov 16 2022 Yannick Cote 0.9.7-2 +- augment kpatch-dnf package versioning to satisfy build (rhbz#2121211) -* Sat Mar 04 2023 Yongde Zhang 0.9.4-3.0.1 -- Disable confirm prompt of kpatch script which may have nagative effect of unloading process +* Wed Nov 09 2022 Yannick Cote 0.9.7-1 +- rebase kpatch user utility code to v0.9.7 (rhbz#2121211) * Fri Jun 10 2022 Yannick Cote 0.9.4-3 - Do not rm selinux rpm owned directory (rhbz#2065609) -- Gitee From c507e3119ccb3681f9778a9c6fb4c3292563e070 Mon Sep 17 00:00:00 2001 From: "zhangyongde.zyd" Date: Mon, 6 Mar 2023 12:34:22 +0800 Subject: [PATCH 2/2] remove confirm prompt when unloading patches --- ...onfirm-prompt-when-unloading-patches.patch | 25 +++++++++++++++++++ kpatch.spec | 8 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0004-remove-confirm-prompt-when-unloading-patches.patch diff --git a/0004-remove-confirm-prompt-when-unloading-patches.patch b/0004-remove-confirm-prompt-when-unloading-patches.patch new file mode 100644 index 0000000..d90dba2 --- /dev/null +++ b/0004-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 97bc6d9..89c59d1 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,8 +1,9 @@ %define kpatch_dnf_ver 0.4 +%define anolis_release .0.1 Name: kpatch Version: 0.9.7 -Release: 2%{?dist} +Release: 2%{anolis_release}%{?dist} Summary: Dynamic kernel patch manager Group: System Environment/Kernel @@ -15,6 +16,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 +Patch3: 0004-remove-confirm-prompt-when-unloading-patches.patch # Upstream backports #Patch100: 0100-xxx.patch @@ -51,6 +53,7 @@ kpatch-patch packages updates. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %setup -D -T -a 1 cd kpatch-dnf-%{kpatch_dnf_ver} @@ -87,6 +90,9 @@ echo "To enable automatic kpatch-patch subscription, run:" echo -e "\t$ dnf kpatch auto" %changelog +* 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 + * Wed Nov 16 2022 Yannick Cote 0.9.7-2 - augment kpatch-dnf package versioning to satisfy build (rhbz#2121211) -- Gitee