chore: 更新版本号 2.2503.6

.gitignore

@@ -24,7 +24,8 @@ debbuild/22.04/etc
 debbuild/22.04/usr
 debbuild/22.04/lib
 release
-rpmbuild
+rpmbuild/RPMS
-!rpmbuild/SPECS/omc.spec
+rpmbuild/SOURCES
+rpmbuild/BUILD
 
 

build.sh

@@ -56,7 +56,7 @@ fi
 ProjectL=omc
 ProjectU=OMC
 PROJECT=${ProjectL}
-VERSION=2.2502.2
+VERSION=2.2503.6
 RelDate=`date +%Y%m%d`
 RelVer=${VERSION}-${RelDate}
 Ky10Arch=ky10.aarch64
@@ -139,9 +139,12 @@ get_os_version() {
 OSVersion=$(get_os_version)
 case $(get_os_info) in
     ubuntu|debian)
-        pkgtype=deb
+        ptype=deb
         if [[ "$OSVersion" == "22.04" ]]; then
             RelOS=ub22
+            DebBuildDir=${DebBuild2204Dir}
+            DebBuildOMCDir=${DebBuild2204OMCDir}
+            DebFEBuildDir=${DebFEBuild2204Dir}         
         elif [[ "$OSVersion" == "18.04" ]]; then
             RelOS=ub18         
         else
@@ -150,15 +153,21 @@ case $(get_os_info) in
         fi
     ;;
     centos|rhel)
-        pkgtype=rpm
+        ptype=rpm
         RelOS=ct8
-        RpmPkgRename=${ProjectL}-r${RelVer}.${RelOS}.${RelArch}.${pkgtype}
+        RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
     ;;
     openEuler)
-        pkgtype=rpm
+        ptype=rpm
         RelOS=oe20
-        RpmPkgName=${ProjectL}-${RelVer}.${RpmArch}.rpm
+        RpmPkgName=${ProjectL}-${RelVer}.${RpmArch}.${ptype}
-        RpmPkgRename=${ProjectL}-r${RelVer}.${RelOS}.${RelArch}.${pkgtype}
+        RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
+    ;;
+    kylin|anolis)
+        ptype=rpm
+        RelOS=ky
+        RpmPkgName=${ProjectL}-${RelVer}.${RpmArch}.${ptype}
+        RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
     ;;
     *)
         echo "Unsupported OS"
@@ -230,24 +239,9 @@ case "${pkgtype}" in
             make
         done
         
-        VersionID=`grep VERSION_ID /etc/os-release`
+        DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
-        if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then
+        if [ ! $ProjectTag = "" ]; then
-            DebBuildDir=${DebBuild2204Dir}
+            DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}-${ProjectTag}.${ptype}
-            DebBuildOMCDir=${DebBuild2204OMCDir}
-            DebFEBuildDir=${DebFEBuild2204Dir}
-            #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
-            DebPkgFile=${PROJECT}-r${RelVer}-ub22.deb
-            if [ ! $ProjectTag = "" ]; then
-                DebPkgFile=${ProjectL}-r${RelVer}-ub22-${ProjectTag}.deb
-            fi
-        elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then
-            DebPkgFile=${ProjectL}-r${RelVer}-ub18.deb
-            if [ ! $ProjectTag = "" ]; then
-                DebPkgFile=${ProjectL}-r${RelVer}-ub18-${ProjectTag}.deb
-            fi            
-        else 
-            echo "Invalid OS release: ${VersionID}"
-            exit 1
         fi  
 
         cd ${EmsBEDir}
@@ -287,6 +281,7 @@ case "${pkgtype}" in
         #cp -rf ${BuildDir}/systemd/*.service  ${DebBuildDir}/lib/systemd/system/
         chmod +x ${DebBuildDir}/usr/local/omc/bin/*
         sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control
+        sed -i "s/Architecture: amd64/Architecture: ${RelArch}/g" ${DebBuildDir}/DEBIAN/control
         perl -0777 -i -pe 's/ne:\n  user: root/ne:\n  user: omcuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml
         dpkg -b ${DebBuildDir} ${ReleasePkgDir}/${DebPkgFile}
 
@@ -307,19 +302,7 @@ case "${pkgtype}" in
             make
         done
         
-        VersionID=`grep VERSION_ID /etc/os-release`
+        DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}-ba.deb
-        if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then
-            DebBuildDir=${DebBuild2204Dir}
-            DebBuildOMCDir=${DebBuild2204OMCDir}
-            DebFEBuildDir=${DebFEBuild2204Dir}
-            #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
-            DebPkgFile=${ProjectL}-r${RelVer}-ub22-ba.deb
-        elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then
-            DebPkgFile=${ProjectL}-r${RelVer}-ub18-ba.deb
-        else 
-            echo "Invalid OS release: ${VersionID}"
-            exit 1
-        fi
 
         cd ${EmsBEDir}
 
@@ -355,10 +338,11 @@ case "${pkgtype}" in
         cp -rf ${BuildDir}/*  ${DebBuildDir}/
         cp -rf ${CustomizedDir}/ba.d ${DebBuildOMCDir}/static
         # replace Chinese character
-        find "${DebBuildOMCDir}/etc/db" -type f -name '*.sql' -exec sed -i 's/[一-龥]//g' {} +
+        find "${DebBuildOMCDir}/etc/db" -type f -name '*.sql' -exec sed -i 's/[一-龥（）“”，。？！］～·]//g' {} +
 	    echo "Replace all chinese character."
         chmod +x ${DebBuildDir}/usr/local/omc/bin
         sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control
+        sed -i "s/Architecture: amd64/Architecture: ${RelArch}/g" ${DebBuildDir}/DEBIAN/control
         perl -0777 -i -pe 's/ne:\n  user: root/ne:\n  user: omcuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml
         dpkg -b ${DebBuildDir} ${ReleasePkgDir}/${DebPkgFile}
 

debbuild/22.04/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: OMC
-Version: 2.2502.2-YYYYMMDD
+Version: 2.2503.6-YYYYMMDD
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  

debbuild/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: OMC
-Version: 2.2502.2-YYYYMMDD
+Version: 2.2503.6-YYYYMMDD
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  

makepkg.sh

@@ -91,8 +91,8 @@ makefe() {
     if [ "${pkgtype}" == "badeb" ]; then
         cp -rf ${customizeddir}/images/* ${feassetsdir}
         cp -rf ${customizeddir}/locales/* ${felocalesdir}
-        find "${feconstantsdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥]//g' {} +
+        find "${feconstantsdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥（）“”，。？！］～·]//g' {} +
-        find "${fehooksdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥]//g' {} +
+        find "${fehooksdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥（）“”，。？！］～·]//g' {} +
     fi     
     npm install --force --registry https://registry.npmmirror.com
     echo -n "Building front-end vue ... "

rpmbuild/SPECS/omc.spec

@@ -8,7 +8,7 @@
 
 Name: %{project_lname} 
 Summary: 5GC OMC
-Version: 2.2502.2
+Version: 2.2503.6
 Release: %{release_date}
 Vendor: omc
 URL: https://www.omc.com/