From a60dd87384096abb65d6c7efaaa902e6fca8137d Mon Sep 17 00:00:00 2001
From: Zhipeng Xie <xiezhipeng1@huawei.com>
Date: Tue, 5 Jan 2021 06:25:47 -0500
Subject: [PATCH] only skip gcc check in cross compile environment

Signed-off-by: Zhipeng Xie <xiezhipeng1@huawei.com>
---
 kpatch.spec   | 16 +++++++++++-----
 make_hotpatch |  9 ++++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/kpatch.spec b/kpatch.spec
index 6bee6f9..f34baeb 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -1,7 +1,7 @@
 Name:           kpatch
 Epoch:          1
 Version:        0.9.1
-Release:        9
+Release:        10
 Summary:        A Linux dynamic kernel patching infrastructure
 
 License:        GPLv2
@@ -97,8 +97,14 @@ popd
 %{_mandir}/man1/*.1.gz
 
 %changelog
-* Wed Dec 31 2020 Zhipeng Xie<xiezhipeng1@huawei.com> -1:0.9.1-9
-- Type:bugfix
+* Tue Jan 5 2021 Zhipeng Xie<xiezhipeng1@huawei.com> -1:0.9.1-10
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:only skip gcc check in cross compile environment
+
+* Thu Dec 31 2020 Zhipeng Xie<xiezhipeng1@huawei.com> -1:0.9.1-9
+- Type:enhancement
 - ID:NA
 - SUG:NA
 - DESC:support remove static variables using KPATCH_IGNORE_STATIC
@@ -206,7 +212,7 @@ popd
 - SUG:restart
 - DESC:add security compile flags
 
-* Tue Sep 27 2019 Zhipeng Xie<xiezhipeng1@huawei.com> - 2.0-3.1.17
+* Fri Sep 27 2019 Zhipeng Xie<xiezhipeng1@huawei.com> - 2.0-3.1.17
 - Type:enhancement
 - ID:NA
 - SUG:restart
@@ -230,7 +236,7 @@ popd
 - SUG:NA
 - DESC:rewrite spec
 
-* Fri Jul 16 2019 yangbin<robin.yb@huawei.com> - 2.0-3.1.13
+* Tue Jul 16 2019 yangbin<robin.yb@huawei.com> - 2.0-3.1.13
 - Type:enhancement
 - ID:NA
 - SUG:restart
diff --git a/make_hotpatch b/make_hotpatch
index 8c06051..fefbad1 100644
--- a/make_hotpatch
+++ b/make_hotpatch
@@ -592,7 +592,14 @@ function fn_makepatch()
     export USERMODFLAGS=`cat $G_KPATCH_FLAGS`
     export NO_PROFILING_CALLS="yes"
     export DISABLE_AFTER_LOAD="yes"
-    kpatch-build -s $G_PATCH_SRC -c $G_KERNEL_CONFIG -v $G_VMLINUX --skip-gcc-check -n "${G_PREFIX}_${G_HOTPATCH_ID}" $G_DEBUG_INFO $G_PATCHFILE
+    UNAME_R=$(uname -r)
+    UNAME_R_ARCH=${UNAME_R##*.}
+    SKIP_GCC_CHECK=""
+    if [[ "${UNAME_R_ARCH}" != "$(uname -p)" ]];then
+            echo "build in cross compile environment, skip gcc check"
+            SKIP_GCC_CHECK="--skip-gcc-check"
+    fi
+    kpatch-build -s $G_PATCH_SRC -c $G_KERNEL_CONFIG -v $G_VMLINUX ${SKIP_GCC_CHECK} -n "${G_PREFIX}_${G_HOTPATCH_ID}" $G_DEBUG_INFO $G_PATCHFILE
     l_ret=$?
     cd - &>/dev/null
     if [ $l_ret -eq 0 ] && [ -f "$G_TMP_DIR/$G_HOTPATCH" ];then
-- 
Gitee