diff --git a/0035-kpatch-build-fix-gcc-version-check-when-using-OOT_MO.patch b/0035-kpatch-build-fix-gcc-version-check-when-using-OOT_MO.patch new file mode 100644 index 0000000..d85fe29 --- /dev/null +++ b/0035-kpatch-build-fix-gcc-version-check-when-using-OOT_MO.patch @@ -0,0 +1,26 @@ +From 3911cf1b0631185f5aafca06610f98bd92f4a9db Mon Sep 17 00:00:00 2001 +From: Bin Hu +Date: Wed, 26 Oct 2022 17:14:50 +0800 +Subject: [PATCH] kpatch-build: fix gcc version check when using OOT_MODULE + +Signed-off-by: Bin Hu +--- + kpatch-build/kpatch-build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build +index 19002a2..c110556 100755 +--- a/kpatch-build/kpatch-build ++++ b/kpatch-build/kpatch-build +@@ -229,7 +229,7 @@ gcc_version_check() { + echo 'void main(void) {}' > "$c" + out="$(gcc -c -pg -ffunction-sections -o "$o" "$c" 2>&1)" + gccver="$(gcc_version_from_file "$o")" +- if [[ -n "$OOT_MODULE" ]]; then ++ if [[ -n "$OOT_MODULE" && "$OOT_MODULE" != "yes" ]]; then + kgccver="$(gcc_version_from_file "$OOT_MODULE")" + else + kgccver="$(gcc_version_from_file "$VMLINUX")" +-- +2.27.0 + diff --git a/kpatch.spec b/kpatch.spec index 064e6df..16f30a0 100644 --- a/kpatch.spec +++ b/kpatch.spec @@ -1,7 +1,7 @@ Name: kpatch Epoch: 1 Version: 0.9.1 -Release: 20 +Release: 21 Summary: A Linux dynamic kernel patching infrastructure License: GPLv2 @@ -46,6 +46,7 @@ Patch0031:0031-create-diff-object-fix-segment-fault-when-sec2-rela-.patch Patch0032:0032-create-diff-object-Fix-out-of-range-relocation-error.patch Patch0033:0033-create-diff-object-Fix-out-of-range-relocation-check.patch Patch0034:0034-add-openEuler-build-support.patch +Patch0035:0035-kpatch-build-fix-gcc-version-check-when-using-OOT_MO.patch BuildRequires: gcc elfutils-libelf-devel kernel-devel git Requires: bc make gcc patch bison flex openssl-devel @@ -106,6 +107,12 @@ popd %{_mandir}/man1/*.1.gz %changelog +* Wed Oct 26 2022 Bin Hu -1:0.9.1-21 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:kpatch-build: fix gcc version check when using OOT_MODULE + * Tue Oct 26 2021 Zhipeng Xie -1:0.9.1-20 - Type:enhancement - ID:NA