fix: build arm /amd
This commit is contained in:
51
build.sh
51
build.sh
@@ -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,15 @@ 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
|
||||
RpmPkgRename=${ProjectL}-r${RelVer}.${RelOS}.${RelArch}.${pkgtype}
|
||||
RpmPkgName=${ProjectL}-${RelVer}.${RpmArch}.${ptype}
|
||||
RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
|
||||
;;
|
||||
*)
|
||||
echo "Unsupported OS"
|
||||
@@ -230,24 +233,9 @@ case "${pkgtype}" in
|
||||
make
|
||||
done
|
||||
|
||||
VersionID=`grep VERSION_ID /etc/os-release`
|
||||
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
|
||||
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
|
||||
DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
|
||||
if [ ! $ProjectTag = "" ]; then
|
||||
DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}-${ProjectTag}.${ptype}
|
||||
fi
|
||||
|
||||
cd ${EmsBEDir}
|
||||
@@ -287,6 +275,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 +296,7 @@ case "${pkgtype}" in
|
||||
make
|
||||
done
|
||||
|
||||
VersionID=`grep VERSION_ID /etc/os-release`
|
||||
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
|
||||
DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}-ba.deb
|
||||
|
||||
cd ${EmsBEDir}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user