52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
|
From f435e99fc2652cd6263f3a2fe02b0947a5279a82 Mon Sep 17 00:00:00 2001
|
||
|
|
From: hubin <hubin73@huawei.com>
|
||
|
|
Date: Tue, 10 May 2022 15:27:28 +0800
|
||
|
|
Subject: [PATCH 2/9] kpatch-build: add KBUILD_MODPOST_WARN=1 to avoid modpost
|
||
|
|
undefined error
|
||
|
|
|
||
|
|
Signed-off-by: hubin <hubin73@huawei.com>
|
||
|
|
---
|
||
|
|
kpatch-build/kpatch-build | 10 +++++-----
|
||
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
|
||
|
|
index 6a9e818..ba33a3e 100644
|
||
|
|
--- a/kpatch-build/kpatch-build
|
||
|
|
+++ b/kpatch-build/kpatch-build
|
||
|
|
@@ -1030,9 +1030,9 @@ fi
|
||
|
|
# $TARGETS used as list, no quotes.
|
||
|
|
# shellcheck disable=SC2086
|
||
|
|
if [[ -z "$USERMODBUILDDIR" ]]; then
|
||
|
|
- make "${MAKEVARS[@]}" "-j$CPUS" $TARGETS 2>&1 | logger || die
|
||
|
|
+ KBUILD_MODPOST_WARN=1 make "${MAKEVARS[@]}" "-j$CPUS" $TARGETS 2>&1 | logger || die
|
||
|
|
else
|
||
|
|
- make "${MAKEVARS[@]}" -C "$USERMODBUILDDIR" M="$USERMODBUILDDIR" $USERMODFLAGS "-j$CPUS" $TARGETS 2>&1 | logger || die
|
||
|
|
+ KBUILD_MODPOST_WARN=1 make "${MAKEVARS[@]}" -C "$USERMODBUILDDIR" M="$USERMODBUILDDIR" $USERMODFLAGS "-j$CPUS" $TARGETS 2>&1 | logger || die
|
||
|
|
fi
|
||
|
|
|
||
|
|
# Save original module symvers
|
||
|
|
@@ -1175,9 +1175,9 @@ for i in $FILES; do
|
||
|
|
remove_patches
|
||
|
|
cd "$SRCDIR" || die
|
||
|
|
if [ -z "$USERMODBUILDDIR" ];then
|
||
|
|
- make "-j$CPUS" $TARGETS 2>&1 | logger || die
|
||
|
|
+ KBUILD_MODPOST_WARN=1 make "-j$CPUS" $TARGETS 2>&1 | logger || die
|
||
|
|
else
|
||
|
|
- make -C "$USERMODBUILDDIR" M="$USERMODBUILDDIR" $USERMODFLAGS "-j$CPUS" $TARGETS 2>&1 | logger || die
|
||
|
|
+ KBUILD_MODPOST_WARN=1 make -C "$USERMODBUILDDIR" M="$USERMODBUILDDIR" $USERMODFLAGS "-j$CPUS" $TARGETS 2>&1 | logger || die
|
||
|
|
fi
|
||
|
|
cp ${KOBJFILE} ${KOBJFILE_PATH}
|
||
|
|
apply_patches
|
||
|
|
@@ -1297,7 +1297,7 @@ KBUILD_EXTRA_SYMBOLS="$KBUILD_EXTRA_SYMBOLS" \
|
||
|
|
KPATCH_LDFLAGS="$KPATCH_LDFLAGS"
|
||
|
|
save_env
|
||
|
|
|
||
|
|
-make "${MAKEVARS[@]}" 2>&1 | logger || die
|
||
|
|
+KBUILD_MODPOST_WARN=1 make "${MAKEVARS[@]}" 2>&1 | logger || die
|
||
|
|
strip -g "$TEMPDIR/patch/$MODNAME.ko"
|
||
|
|
|
||
|
|
if [[ "$USE_KLP" -eq 1 ]]; then
|
||
|
|
--
|
||
|
|
2.31.0.windows.1
|
||
|
|
|