kpatch/0014-add-object-in-kpatch.patch

37 lines
1.1 KiB
Diff
Raw Normal View History

From 99de1c4a9cf1776b028149575377d7b61faecdbe Mon Sep 17 00:00:00 2001
From: Bin Yang <robin.yb@huawei.com>
Date: Tue, 16 Jul 2019 14:39:27 +0800
Subject: [PATCH 14/38] add object in kpatch
it is required by make_hotpatch users
Signed-off-by: Bin Yang <robin.yb@huawei.com>
---
kpatch-build/kpatch-build | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index 9f14bb2..67e56e1 100755
--- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build
@@ -1428,6 +1428,8 @@ echo -n "Patched objects:"
for i in $(echo "${objnames[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')
do
echo -n " $i"
+ echo -n " $(basename $i)"
+ echo -n "$(basename $i)" >> $TEMPDIR/patch/object
done
echo
@@ -1550,6 +1552,7 @@ UNDEFINED=$(comm -23 <(sort -u "${TEMPDIR}"/undefined_references) \
[[ -z "$USERMODBUILDDIR" ]] && [[ -n "$UNDEFINED" ]] && die "Undefined symbols: $UNDEFINED"
cp -f "$TEMPDIR/patch/$MODNAME.ko" "$BASE" || die
+cp -f "$TEMPDIR/patch/object" "$BASE" || die
[[ "$DEBUG" -eq 0 && "$SKIPCLEANUP" -eq 0 ]] && rm -f "$LOGFILE"
--
2.33.0