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 d90dba2a26a8d1024b38bf08994eb775a1704d03..0000000000000000000000000000000000000000 --- 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 deleted file mode 100644 index 5b21263ac204cbbdabbe2847859c3a3d56d88470..0000000000000000000000000000000000000000 --- a/download +++ /dev/null @@ -1,2 +0,0 @@ -21d48a6aa2ff4f3afd934f7fced99018 kpatch-dnf-v0.4.tar.gz -f38426f46e798bcc8fccdb7ec1c5ae14 v0.9.4.tar.gz diff --git a/kpatch-dnf-v0.4.tar.gz b/kpatch-dnf-v0.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..2a442a6d769bb5db1646e8ea6b1bd4c5121b8e97 Binary files /dev/null and b/kpatch-dnf-v0.4.tar.gz differ diff --git a/kpatch.spec b/kpatch.spec index 1a96df85332b92744dd6d19cc57c8277c96eae50..8dd8b9e7828f5ed7c2abdbfb3a28cb554925d52e 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,8 +1,8 @@ -%define anolis_release 2 +%define anolis_release 1 %define kpatch_dnf_ver 0.4 Name: kpatch -Version: 0.9.4 +Version: 0.9.7 Release: %{anolis_release}%{?dist} Summary: Dynamic kernel patch manager @@ -15,7 +15,8 @@ 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 + +BuildRequires: make Requires: bash kmod binutils Recommends: kpatch-dnf @@ -30,7 +31,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 @@ -41,7 +42,7 @@ When enabled, kernel packages are automatically subscribed to corresponding kpatch-patch packages updates. %prep -%autosetup -n %{name}-0.9.4 -p1 -a 1 +%autosetup -n %{name}-0.9.7 -p1 -a 1 cd kpatch-dnf-%{kpatch_dnf_ver} cd .. @@ -77,6 +78,10 @@ echo "To enable automatic kpatch-patch subscription, run:" echo -e "\t$ dnf kpatch auto" %changelog +* Fri Feb 21 2025 Xiaoping Liu - 0.9.7-1 +- update to 0.9.7 from 0.9.4 +- Remove patch because upstream has changed + * Tue Mar 12 2024 Bo Ren - 0.9.4-2 - Rebuild with python3.11 diff --git a/v0.9.7.tar.gz b/v0.9.7.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..ee3ad0250cb7261dcdee4524f05fe90034d22e30 Binary files /dev/null and b/v0.9.7.tar.gz differ