1
0

fix: build arm /amd

This commit is contained in:
zhangsz
2025-02-21 19:38:51 +08:00
parent 49f0ba4a7a
commit 6adf76b589

View File

@@ -139,9 +139,12 @@ get_os_version() {
OSVersion=$(get_os_version) OSVersion=$(get_os_version)
case $(get_os_info) in case $(get_os_info) in
ubuntu|debian) ubuntu|debian)
pkgtype=deb ptype=deb
if [[ "$OSVersion" == "22.04" ]]; then if [[ "$OSVersion" == "22.04" ]]; then
RelOS=ub22 RelOS=ub22
DebBuildDir=${DebBuild2204Dir}
DebBuildOMCDir=${DebBuild2204OMCDir}
DebFEBuildDir=${DebFEBuild2204Dir}
elif [[ "$OSVersion" == "18.04" ]]; then elif [[ "$OSVersion" == "18.04" ]]; then
RelOS=ub18 RelOS=ub18
else else
@@ -150,15 +153,15 @@ case $(get_os_info) in
fi fi
;; ;;
centos|rhel) centos|rhel)
pkgtype=rpm ptype=rpm
RelOS=ct8 RelOS=ct8
RpmPkgRename=${ProjectL}-r${RelVer}.${RelOS}.${RelArch}.${pkgtype} RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
;; ;;
openEuler) openEuler)
pkgtype=rpm ptype=rpm
RelOS=oe20 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}
;; ;;
*) *)
echo "Unsupported OS" echo "Unsupported OS"
@@ -230,24 +233,9 @@ case "${pkgtype}" in
make make
done done
VersionID=`grep VERSION_ID /etc/os-release` DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then
DebBuildDir=${DebBuild2204Dir}
DebBuildOMCDir=${DebBuild2204OMCDir}
DebFEBuildDir=${DebFEBuild2204Dir}
#DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
DebPkgFile=${PROJECT}-r${RelVer}-ub22.deb
if [ ! $ProjectTag = "" ]; then if [ ! $ProjectTag = "" ]; then
DebPkgFile=${ProjectL}-r${RelVer}-ub22-${ProjectTag}.deb DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}-${ProjectTag}.${ptype}
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 fi
cd ${EmsBEDir} cd ${EmsBEDir}
@@ -287,6 +275,7 @@ case "${pkgtype}" in
#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
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 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} dpkg -b ${DebBuildDir} ${ReleasePkgDir}/${DebPkgFile}
@@ -307,19 +296,7 @@ case "${pkgtype}" in
make make
done 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} cd ${EmsBEDir}