diff --git a/thirdparty/srs/HPKBUILD b/thirdparty/srs/HPKBUILD index e1688c89617aeec3abcb3ed714ed4969d307cfeb..55994a6a0dd6bf360fd4c49735915bb721f408d7 100644 --- a/thirdparty/srs/HPKBUILD +++ b/thirdparty/srs/HPKBUILD @@ -27,10 +27,12 @@ prepare() { then cd $builddir patch -p1 < `pwd`/../srs_oh_pkg.patch - # patch只需要打一次,关闭打patch + # patch只需要打一次,关闭打patch patchflag=false cd $OLDPWD fi + # srs里的/usr/bin/bash导致测试失败,故改为/data/CIusr/bin/bash + sed -i "s#/usr/bin/bash#/data/CIusr/bin/bash#g" $builddir/trunk/etc/init.d/srs cp -arf $builddir $builddir-$ARCH-build if [ $ARCH == "armeabi-v7a" ] then diff --git a/thirdparty/srs/HPKCHECK b/thirdparty/srs/HPKCHECK index 1a6b36d1036aa55622fba1ad11282fbc5542b3ce..f1aecd6e3ea63efe7d5d7df295f0d494d3a462c8 100644 --- a/thirdparty/srs/HPKCHECK +++ b/thirdparty/srs/HPKCHECK @@ -22,7 +22,8 @@ openharmonycheck() { echo "error: not found ipv4 addr" > ${logfile} 2>&1 mkdir ${LYCIUM_FAULT_PATH}/${pkgname} cp ./objs/srs.log ${LYCIUM_FAULT_PATH}/${pkgname}/ - cd $OLDPWD + # 这里返回会导致后面./objs路径不对,从而找不到相关文件,故注释 + # cd $OLDPWD return -1; fi ipv4_addr=${ipv4_addr_result:5}