1
0

fix: build deb part ok

This commit is contained in:
2024-03-08 10:24:14 +08:00
parent 433e4c6340
commit 87002d8201

View File

@@ -1,12 +1,10 @@
#!/bin/bash #!/bin/bash
ProcList="restagent crontask sshsvc captrace data2html"
ProjectL=omc ProjectL=omc
ProjectU=OMC ProjectU=OMC
PROJECT=${ProjectL} PROJECT=${ProjectL}
VERSION=2.2403.1 VERSION=2.2403.1
RelDate=`date +%Y%m%d` RelDate=`date +%Y%m%d`
Release=${RelDate}
RelVer=${VERSION}-${RelDate} RelVer=${VERSION}-${RelDate}
Ky10Arch=ky10.aarch64 Ky10Arch=ky10.aarch64
RpmPkgName=${ProjectL}-${RelVer}.ky10.aarch64.rpm RpmPkgName=${ProjectL}-${RelVer}.ky10.aarch64.rpm
@@ -22,8 +20,6 @@ DumpToolDir=${EmsBEDir}/tools/misc
PLATFORM=amd64 PLATFORM=amd64
ARMPLATFORM=aarch64 ARMPLATFORM=aarch64
GitLocalRoot=${HOME}/local.git
EmsBuildRoot=${GitLocalRoot}/build.ems
BuildDir=${EmsBuildRoot}/build BuildDir=${EmsBuildRoot}/build
BuildOMCDir=${BuildDir}/usr/local/omc BuildOMCDir=${BuildDir}/usr/local/omc
BuildOMCBinDir=${BuildOMCDir}/bin BuildOMCBinDir=${BuildOMCDir}/bin
@@ -37,8 +33,6 @@ DebFEBuild2204Dir=${EmsBuildRoot}/debbuild/22.04/usr/local/omc/htdocs
RpmBuildDir=${EmsBuildRoot}/rpmbuild RpmBuildDir=${EmsBuildRoot}/rpmbuild
RpmFEBuildDir=${RpmBuildDir}/BUILD/usr/local/omc/htdocs RpmFEBuildDir=${RpmBuildDir}/BUILD/usr/local/omc/htdocs
OmcInstallDir=/usr/local/omc OmcInstallDir=/usr/local/omc
ReleaseDir=${EmsBuildRoot}/release
EmsBEDir=${GitLocalRoot}/be.ems
ConfigEtcDir=${EmsBEDir}/config/etc ConfigEtcDir=${EmsBEDir}/config/etc
ConfigSystemdDir=${EmsBEDir}/config/systemd ConfigSystemdDir=${EmsBEDir}/config/systemd
EmsFEDir=${GitLocalRoot}/fe.ems EmsFEDir=${GitLocalRoot}/fe.ems
@@ -72,6 +66,7 @@ elif [[ ${RpmArch} =~ "aarch64" ]];then
RelArch=arm64 RelArch=arm64
fi fi
ProcList="restagent crontask sshsvc captrace data2html"
cd $EmsBEDir cd $EmsBEDir
for procName in $ProcList;do for procName in $ProcList;do
cd $EmsBEDir/$procName cd $EmsBEDir/$procName
@@ -102,9 +97,9 @@ case "$1" in
DebBuildDir=${DebBuild2204Dir} DebBuildDir=${DebBuild2204Dir}
DebFEBuildDir=${DebFEBuild2204Dir} DebFEBuildDir=${DebFEBuild2204Dir}
#DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
DebPkgFile=${PROJECT}-r${VERSION}-${Release}-ub22.deb DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22.deb
elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then
DebPkgFile=${PROJECT}-r${VERSION}-${Release}-ub18.deb DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18.deb
else else
echo "Invalid OS release: ${VersionID}" echo "Invalid OS release: ${VersionID}"
exit 1 exit 1
@@ -143,7 +138,7 @@ case "$1" in
#cp -rf ${BuildDir}/nginx/* ${DebBuildDir}/etc/nginx/conf.d #cp -rf ${BuildDir}/nginx/* ${DebBuildDir}/etc/nginx/conf.d
#cp -rf ${BuildDir}/systemd/*.service ${DebBuildDir}/lib/systemd/system/ #cp -rf ${BuildDir}/systemd/*.service ${DebBuildDir}/lib/systemd/system/
chmod +x ${DebBuildDir}/usr/local/omc/bin/* chmod +x ${DebBuildDir}/usr/local/omc/bin/*
sed -i 's/YYYYMMDD/${RelDate}/g' ${DebBuildDir}/DEBIAN/control sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control
perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: agtuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: agtuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml
dpkg -b ${DebBuildDir} ${ReleaseDebs}/${DebPkgFile} dpkg -b ${DebBuildDir} ${ReleaseDebs}/${DebPkgFile}