From cd466570760d39ed059860d05b1d98bc0b37ffad Mon Sep 17 00:00:00 2001
From: wuguangzhao <wuguangzhao@h-partners.com>
Date: Tue, 17 Dec 2024 20:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dopenssl=5F1=5F1=5F1w=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E5=9B=A0=E4=B8=BAperl=E4=BD=8D=E7=BD=AE=E4=B8=8D?=
 =?UTF-8?q?=E5=AF=B9=E5=AF=BC=E8=87=B4=E6=B5=8B=E8=AF=95=E4=B8=8D=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wuguangzhao <wuguangzhao@h-partners.com>
---
 community/openssl_1_1_1w/HPKBUILD | 11 ++++++-----
 community/openssl_1_1_1w/HPKCHECK |  7 +++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/community/openssl_1_1_1w/HPKBUILD b/community/openssl_1_1_1w/HPKBUILD
index 010dcdc2..d8146ec1 100644
--- a/community/openssl_1_1_1w/HPKBUILD
+++ b/community/openssl_1_1_1w/HPKBUILD
@@ -43,7 +43,7 @@ prepare() {
     then
         cd $builddir
         # 屏蔽测试bug
-        patch -p1 < `pwd`/../openssl_oh_test.patch
+        patch -p1 < $PKGBUILD_ROOT/openssl_oh_test.patch > $publicbuildlog 2>&1
         # patch只需要打一次,关闭打patch
         patchflag=false
         cd $OLDPWD
@@ -67,8 +67,8 @@ prepare() {
 build() {
     cd $builddir/$ARCH-build
      #依赖zlib的OpenSSL支持使用gzip和deflate压缩算法的HTTPS协议可根据需求开启关闭
-    ../Configure "$@" $host zlib > `pwd`/build.log 2>&1
-    make -j4 >> `pwd`/build.log 2>&1
+    ../Configure "$@" $host zlib > $buildlog 2>&1
+    $MAKE VERBOSE=1 >> $buildlog 2>&1
     ret=$?
     cd $OLDPWD
     return $ret
@@ -76,13 +76,13 @@ build() {
 
 package() {
     cd $builddir/$ARCH-build
-    make install >> `pwd`/build.log 2>&1
+    $MAKE install VERBOSE=1 >> $buildlog 2>&1
     cd $OLDPWD
 }
 
 check() {
     cd $builddir/$ARCH-build
-    make depend >> `pwd`/build.log 2>&1
+    $MAKE depend VERBOSE=1 >> $buildlog 2>&1
     cd $OLDPWD
     unset host
     if [ $ARCH == "armeabi-v7a" ]
@@ -96,6 +96,7 @@ check() {
         return -1
     fi
     echo "The test must be on an OpenHarmony device!"
+    sed -i 's#/usr/bin/perl#/data/CIusr/bin/perl#g' $builddir/$ARCH-build/Makefile
     # real test CMD
     # 将编译目录加到 LD_LIBRARY_PATH 环境变量
     # make test
diff --git a/community/openssl_1_1_1w/HPKCHECK b/community/openssl_1_1_1w/HPKCHECK
index e23f4690..afc825ab 100644
--- a/community/openssl_1_1_1w/HPKCHECK
+++ b/community/openssl_1_1_1w/HPKCHECK
@@ -15,13 +15,16 @@
 # Maintainer: lpzhong <278527840@qq.com>
 
 source HPKBUILD > /dev/null 2>&1
-logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname:0:7}/${pkgname:0:7}_${ARCH}_${OHOS_SDK_VER}_test.log
+logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log
 openharmonycheck() {
     res=0
     cd ${builddir}/${ARCH}-build
-    sed -i "s#usr/bin/perl#perl#g" `grep -rn 'usr/bin/perl'|awk -F':'{print $1}'|sort -u`
     make test > ${logfile} 2>&1
     res=$?
+    if [ $res -ne 0 ];then
+        mkdir ${LYCIUM_FAULT_PATH}/${pkgname}
+        cp ${logfile} ${LYCIUM_FAULT_PATH}/${pkgname}/     
+    fi 
     cd $OLDPWD
 
     return $res
-- 
Gitee