From 61b875124a736064e94a787d94779996b0c55dbc Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Wed, 10 Jul 2024 18:36:09 +0800
Subject: [PATCH] =?UTF-8?q?build:=20=E6=89=93=E5=8C=85=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.sh                      | 21 +++++++++++----------
 build/rpmbuild/SPECS/omc.spec |  4 +---
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build.sh b/build.sh
index 107f66a..dca0d34 100644
--- a/build.sh
+++ b/build.sh
@@ -28,8 +28,6 @@ fi
 # Use a new parameter list
 set -- "${new_args[@]}"
 
-ProjectL=omc
-ProjectU=OMC
 VERSION=2.2407.1
 RelDate=`date +%Y%m%d`
 RelVer=${VERSION}-${RelDate}
@@ -56,6 +54,7 @@ case "${pkgtype}" in
         # 还原打包目录
         rm -rf ${RpmBuildDir}
         git checkout .
+        git pull
         cp -rf ${SystemDir}/* ${RpmBuildDir}/BUILD
         cp -rf ${RpmBuildDirOMC}/etc/db/common/* ${RpmBuildDirOMC}/etc/db/install
         cp -rf ${RpmBuildDirOMC}/etc/db/common/* ${RpmBuildDirOMC}/etc/db/upgrade
@@ -78,13 +77,15 @@ case "${pkgtype}" in
         cd ${EmsBEDir}
         chmod 755 ${RpmBuildDir}
         chmod 755 ${RpmBuildDirOMC}
-        DebPkgFile=omc-r${RelVer}-ky10-nms_cxy.rpm
-        rpmbuild -bb -D "_topdir ${RpmBuildDir}" ${RpmBuildDir}/SPECS/omc.spec   
+        rpmbuild -bb -D "_topdir ${RpmBuildDir}" ${RpmBuildDir}/SPECS/omc.spec
+
+        RpmPkgFile=${RpmReleaseDebsDir}/omc-r${RelVer}-ky10.rpm
+        mv ${RpmBuildDir}/RPMS/aarch64/omc-${RelVer}-ky10.aarch64.rpm ${RpmBuildDir}
 
         # 生成MD5文件
-        cd $RpmReleaseDebsDir
         rm -f omc-md5sum.txt
-        md5sum ${RpmReleaseDebsDir}/${DebPkgFile} >omc-md5sum.txt
+        md5sum ${RpmBuildDir} >omc-md5sum.txt
+        echo ${RpmBuildDir}
     ;;
     deb)
         # 还原打包目录
@@ -115,13 +116,13 @@ case "${pkgtype}" in
         chmod 755 ${DebBuildDir}/DEBIAN/postinst
         chmod 755 ${DebBuildDir}/DEBIAN/postrm
         sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control
-        DebPkgFile=omc-r${RelVer}-ub22-nms_cxy.deb
-        dpkg -b ${DebBuildDir} ${DebReleaseDebsDir}/${DebPkgFile}
+        DebPkgFile=${DebReleaseDebsDir}/omc-r${RelVer}-ub22-nms_cxy.deb
+        dpkg -b ${DebBuildDir} ${DebPkgFile}
 
         # 生成MD5文件
-        cd $DebReleaseDebsDir
         rm -f omc-md5sum.txt
-        md5sum ${DebReleaseDebsDir}/${DebPkgFile} >omc-md5sum.txt
+        md5sum ${DebPkgFile} >omc-md5sum.txt
+        echo ${DebPkgFile}
     ;;
     *)
         usage
diff --git a/build/rpmbuild/SPECS/omc.spec b/build/rpmbuild/SPECS/omc.spec
index b2dc5b0..27bcafc 100644
--- a/build/rpmbuild/SPECS/omc.spec
+++ b/build/rpmbuild/SPECS/omc.spec
@@ -3,10 +3,8 @@
 %define __arch_install_post %{nil}
 %define release_version 1
 %define release_date %(echo `date +%%Y%%m%%d`)
-%define project_lname omc
-%define project_Uname OMC
 
-Name: %{project_lname} 
+Name: omc
 Summary: AGrandTech 5GC OMC
 Version: 2.2407.1
 Release: %{release_date}