From c2c09e00612a8755982f3d267477b27eae5d4366 Mon Sep 17 00:00:00 2001
From: Xinpeng Liu <liuxp11@chinatelecom.cn>
Date: Fri, 28 May 2021 15:42:04 +0800
Subject: [PATCH 1/2] fix code style

---
 make_hotpatch | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/make_hotpatch b/make_hotpatch
index 8c06051..e49f5c6 100644
--- a/make_hotpatch
+++ b/make_hotpatch
@@ -326,20 +326,20 @@ function fn_verify_input()
     if [ -z "`echo "$input_param" | grep -w "\-i"`" \
         -a -z "`echo $input_param | grep -w "\-\-id"`" \
         -a $# -gt 1 ];then
-    echo "error: missing param -i or --id"
-    fn_do_clean
-    fn_usage
-    exit 1
-fi
-if [ -z "`echo "$input_param" | grep -w "\-d"`" \
-    -a -z "`echo $input_param | grep -w "\-\-diffext"`" \
-    -a -z "`echo $input_param | grep -w "\-p"`" \
-    -a -z "`echo $input_param | grep -w "\-\-patch"`" \
-    -a $# -gt 1 ];then
-echo "error: missing param -d,--diffext or -p,--patch"
-fn_do_clean
-fn_usage
-exit 1
+        echo "error: missing param -i or --id"
+        fn_do_clean
+        fn_usage
+        exit 1
+    fi
+    if [ -z "`echo "$input_param" | grep -w "\-d"`" \
+        -a -z "`echo $input_param | grep -w "\-\-diffext"`" \
+        -a -z "`echo $input_param | grep -w "\-p"`" \
+        -a -z "`echo $input_param | grep -w "\-\-patch"`" \
+        -a $# -gt 1 ];then
+        echo "error: missing param -d,--diffext or -p,--patch"
+        fn_do_clean
+        fn_usage
+        exit 1
     fi
 
     while [ $# -ge 1 ]; do
-- 
Gitee


From f1b9c097587f437321a01f7099ab1b1ce26b893c Mon Sep 17 00:00:00 2001
From: Xinpeng Liu <liuxp11@chinatelecom.cn>
Date: Fri, 28 May 2021 17:53:52 +0800
Subject: [PATCH 2/2] compile bug

failed to access
'/root/rpmbuild/BUILDROOT/kpatch-0.9.1-12.x86_64/opt/patch_workspace/': No such
file or directory
---
 kpatch.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/kpatch.spec b/kpatch.spec
index f091b96..fc9c386 100644
--- a/kpatch.spec
+++ b/kpatch.spec
@@ -1,7 +1,7 @@
 Name:           kpatch
 Epoch:          1
 Version:        0.9.1
-Release:        6
+Release:        7
 Summary:        A Linux dynamic kernel patching infrastructure
 
 License:        GPLv2
@@ -67,6 +67,7 @@ export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 %make_install PREFIX=%{_prefix}
 
 install -Dm 0500 -t %{buildroot}/%{_bindir} %{SOURCE1} %{SOURCE2}
+mkdir -p %{buildroot}/opt/patch_workspace
 install -Dm 0500 -t %{buildroot}/opt/patch_workspace/ %{SOURCE3}
 pushd %{buildroot}/opt/patch_workspace
 mkdir hotpatch package
@@ -94,6 +95,12 @@ popd
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Fri May 28 2021 Xinpeng Liu<liuxp11@chinatelecom.cn> -1:0.9.1-7
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:modify the code stype in make_hotpatch and fix compile bug
+
 * Thu Nov 22 2020 Zhipeng Xie<xiezhipeng1@huawei.com> -1:0.9.1-6
 - Type:enhancement
 - ID:NA
-- 
Gitee