kpatch-build: do not copy linux scripts when building OOT module hotpatch
Signed-off-by: hubin <hubin73@huawei.com>
This commit is contained in:
parent
fe6e07a592
commit
bd4a671d9c
27
0038-kpatch-build-do-not-copy-linux-scripts-when.patch
Normal file
27
0038-kpatch-build-do-not-copy-linux-scripts-when.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
From 72d80c02e16d7558bea6512116bac2b9461bf879 Mon Sep 17 00:00:00 2001
|
||||||
|
From: hubin <hubin73@huawei.com>
|
||||||
|
Date: Tue, 10 May 2022 16:12:29 +0800
|
||||||
|
Subject: [PATCH] kpatch-build: do not copy linux scripts when building OOT
|
||||||
|
module hotpatch
|
||||||
|
|
||||||
|
Signed-off-by: hubin <hubin73@huawei.com>
|
||||||
|
---
|
||||||
|
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 ce163e5..dc5f5a5 100644
|
||||||
|
--- a/kpatch-build/kpatch-build
|
||||||
|
+++ b/kpatch-build/kpatch-build
|
||||||
|
@@ -955,7 +955,7 @@ grep -q "CONFIG_GCC_PLUGIN_RANDSTRUCT=y" "$CONFIGFILE" && die "kernel option 'CO
|
||||||
|
# support extended ELF sections. Disable the BTF typeinfo generation in
|
||||||
|
# link-vmlinux.sh and Makefile.modfinal since kpatch doesn't care about
|
||||||
|
# that anyway.
|
||||||
|
-if grep -q "CONFIG_DEBUG_INFO_BTF=y" "$CONFIGFILE" ; then
|
||||||
|
+if grep -q "CONFIG_DEBUG_INFO_BTF=y" "$CONFIGFILE" && [[ -z "$OOT_MODULE" ]] ; then
|
||||||
|
cp -f "$SRCDIR/scripts/link-vmlinux.sh" "$TEMPDIR/link-vmlinux.sh" || die
|
||||||
|
sed -i 's/CONFIG_DEBUG_INFO_BTF/DISABLED_FOR_KPATCH_BUILD/g' "$SRCDIR"/scripts/link-vmlinux.sh || die
|
||||||
|
|
||||||
|
--
|
||||||
|
2.31.0.windows.1
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
Name: kpatch
|
Name: kpatch
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 0.9.5
|
Version: 0.9.5
|
||||||
Release: 6
|
Release: 7
|
||||||
Summary: A Linux dynamic kernel patching infrastructure
|
Summary: A Linux dynamic kernel patching infrastructure
|
||||||
|
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
@ -50,6 +50,7 @@ Patch0034:0034-create-diff-object-ignore-changed-of-section-__patch.patch
|
|||||||
Patch0035:0035-create-diff-object-fix-null-pointer-dereference-in-k.patch
|
Patch0035:0035-create-diff-object-fix-null-pointer-dereference-in-k.patch
|
||||||
Patch0036:0036-create-diff-object-ignore-.note.gnu.property-section.patch
|
Patch0036:0036-create-diff-object-ignore-.note.gnu.property-section.patch
|
||||||
Patch0037:0037-create-diff-object-skip-creating-.kpatch.arch-sectio.patch
|
Patch0037:0037-create-diff-object-skip-creating-.kpatch.arch-sectio.patch
|
||||||
|
Patch0038:0038-kpatch-build-do-not-copy-linux-scripts-when.patch
|
||||||
|
|
||||||
BuildRequires: gcc elfutils-libelf-devel kernel-devel git
|
BuildRequires: gcc elfutils-libelf-devel kernel-devel git
|
||||||
Requires: bc make gcc patch bison flex openssl-devel
|
Requires: bc make gcc patch bison flex openssl-devel
|
||||||
@ -110,6 +111,12 @@ popd
|
|||||||
%{_mandir}/man1/*.1.gz
|
%{_mandir}/man1/*.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 10 2022 Bin Hu <hubin73@huawei.com> -1:0.9.5-7
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:kpatch-build: do not copy linux scripts when building OOT module hotpatch
|
||||||
|
|
||||||
* Tue May 10 2022 Bin Hu <hubin73@huawei.com> -1:0.9.5-6
|
* Tue May 10 2022 Bin Hu <hubin73@huawei.com> -1:0.9.5-6
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user