OMC/build.ems
1
0
Fork 0
Code Issues Activity

update make package

Browse Source
This commit is contained in:
simonzhangsz
2024-10-30 14:59:11 +08:00
parent 6a48f1182f
commit 109c8ad68a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.sh
View File

@@ -117,10 +117,10 @@ if [[ ${RpmArch} =~ "x86_64" ]];then
elif [[ ${RpmArch} =~ "aarch64" ]];then elif [[ ${RpmArch} =~ "aarch64" ]];then
RelArch=arm64 RelArch=arm64
fi fi
ReleasePkgDir=${ReleaseDir}/"${pkgtype}"s/${RelArch}
case "${pkgtype}" in case "${pkgtype}" in
rpm) rpm)
ReleasePkgDir=${ReleaseDir}/rpms/${RelArch}
ProcList="restagent crontask sshsvc captrace data2html" ProcList="restagent crontask sshsvc captrace data2html"
cd $EmsBEDir cd $EmsBEDir
for procName in $ProcList;do for procName in $ProcList;do
@@ -180,6 +180,7 @@ case "${pkgtype}" in
md5sum $RpmPkgRename >omc-md5sum.txt md5sum $RpmPkgRename >omc-md5sum.txt
;; ;;
deb) deb)
ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
ProcList="restagent crontask sshsvc captrace data2html" ProcList="restagent crontask sshsvc captrace data2html"
cd $EmsBEDir cd $EmsBEDir
for procName in $ProcList;do for procName in $ProcList;do
@@ -249,6 +250,7 @@ case "${pkgtype}" in
md5sum ${DebPkgName} >omc-md5sum.txt md5sum ${DebPkgName} >omc-md5sum.txt
;; ;;
badeb) badeb)
ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
ProcList="restagent crontask sshsvc captrace data2html" ProcList="restagent crontask sshsvc captrace data2html"
cd $EmsBEDir cd $EmsBEDir
for procName in $ProcList;do for procName in $ProcList;do
@@ -260,7 +262,7 @@ case "${pkgtype}" in
VersionID=`grep VERSION_ID /etc/os-release` VersionID=`grep VERSION_ID /etc/os-release`
if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then
DebBuildDir=${DebBuild2204Dir} DebBuildDir=${DebBuild2204Dir}
DebBuildOMCDir=${DebBuild2204OMCDir} DebFEBuildDir=${DebFEBuild2204Dir}
DebFEBuildDir=${DebFEBuild2204Dir} DebFEBuildDir=${DebFEBuild2204Dir}
#DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22-ba.deb DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22-ba.deb

6
makepkg.sh
View File

@@ -19,7 +19,7 @@ new_args=()
be_args=() be_args=()
# Traverse all parameters # Traverse all parameters
for arg in "$@"; do for arg in "$@"; do
if [[ "$arg" == "deb" || "$arg" == "badeb" || "$arg" == "rpm" ]]; then if [[ "$arg" == "deb" || "$arg" == "rpm" ]]; then
pkgtype=$arg pkgtype=$arg
be_args+=("$arg") be_args+=("$arg")
else else
@@ -49,6 +49,10 @@ while getopts "m:r:d" option; do
d) d)
be_args+=("-d") be_args+=("-d")
;; ;;
c)
pkgtype="badeb"
be_args+=("$pkgtype")
;;
\?) \?)
echo "Invalid option: -$OPTARG" >&2 echo "Invalid option: -$OPTARG" >&2
usage usage