From b079c9f333b91124926dd10c7aaf035eccc033a2 Mon Sep 17 00:00:00 2001 From: wxiat Date: Tue, 13 Jun 2023 11:14:06 +0800 Subject: [PATCH] sw-20230613 --- kpatch-0.9.4-sw.patch | 14 ++++++++++++++ kpatch.spec | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 kpatch-0.9.4-sw.patch diff --git a/kpatch-0.9.4-sw.patch b/kpatch-0.9.4-sw.patch new file mode 100644 index 0000000..956aa75 --- /dev/null +++ b/kpatch-0.9.4-sw.patch @@ -0,0 +1,14 @@ +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 92cf82a..ea7ce1a 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,5 +1,5 @@ %define kpatch_dnf_ver 0.4 -%define anolis_release .0.1 +%define anolis_release .0.2 Name: kpatch Version: 0.9.4 @@ -23,6 +23,7 @@ Patch3: 0004-remove-confirm-prompt-when-unloading-patches.patch # kpatch-dnf backports #Patch200: 0200-xxx.patch +Patch1000: kpatch-0.9.4-sw.patch Requires: bash kmod binutils Recommends: kpatch-dnf @@ -54,6 +55,7 @@ kpatch-patch packages updates. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch1000 -p1 %setup -D -T -a 1 cd kpatch-dnf-%{kpatch_dnf_ver} @@ -91,6 +93,9 @@ echo -e "\t$ dnf kpatch auto" %changelog +* Tue Jun 13 2023 wuxiat 0.9.4-3.0.2 +- add sw Patch + * 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 -- Gitee