Merge remote-tracking branch 'origin/main' into lichang
This commit is contained in:
6
makefile
6
makefile
@@ -107,7 +107,7 @@ dist:
|
|||||||
--exclude=../crontask/crontask \
|
--exclude=../crontask/crontask \
|
||||||
--exclude=../initems/initems
|
--exclude=../initems/initems
|
||||||
|
|
||||||
prep_deb: $(BINNAME)
|
pre_build: $(BINNAME)
|
||||||
# clear build cache
|
# clear build cache
|
||||||
rm -rf $(FrontBuildDir)/front/*
|
rm -rf $(FrontBuildDir)/front/*
|
||||||
rm -rf $(DebFEBuildDir)/front/*
|
rm -rf $(DebFEBuildDir)/front/*
|
||||||
@@ -134,7 +134,7 @@ replace_chinese:
|
|||||||
@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 charecter."
|
@echo "Replace all chinese charecter."
|
||||||
|
|
||||||
deb: prep_deb
|
deb: pre_build
|
||||||
cp -rf $(CustomizedDir)/agt.d $(DebBuildOMCDir)/static
|
cp -rf $(CustomizedDir)/agt.d $(DebBuildOMCDir)/static
|
||||||
cp -rf $(CustomizedDir)/omc.d $(DebBuildOMCDir)/static
|
cp -rf $(CustomizedDir)/omc.d $(DebBuildOMCDir)/static
|
||||||
#cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d
|
#cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d
|
||||||
@@ -145,7 +145,7 @@ deb: prep_deb
|
|||||||
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) $(ReleaseDebs)/$(DebPkgFile)
|
dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile)
|
||||||
|
|
||||||
ba-deb: prep_deb replace_chinese
|
badeb: pre_build replace_chinese
|
||||||
cp -rf $(CustomizedDir)/ba.d $(DebBuildOMCDir)/static
|
cp -rf $(CustomizedDir)/ba.d $(DebBuildOMCDir)/static
|
||||||
#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/
|
||||||
|
|||||||
@@ -20,6 +20,9 @@ check_args() {
|
|||||||
elif [ "${C_ARG_LOWER}" == "omc" ]; then
|
elif [ "${C_ARG_LOWER}" == "omc" ]; then
|
||||||
C_ARG_UPPER="OMC"
|
C_ARG_UPPER="OMC"
|
||||||
sed -i 's/VENDORS=.*/VENDORS=OMC/' /usr/local/omc/etc/omc.conf
|
sed -i 's/VENDORS=.*/VENDORS=OMC/' /usr/local/omc/etc/omc.conf
|
||||||
|
elif [ "${C_ARG_LOWER}" == "agt" ]; then
|
||||||
|
C_ARG_UPPER="AGT"
|
||||||
|
sed -i 's/VENDORS=.*/VENDORS=AGT/' /usr/local/omc/etc/omc.conf
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
m)
|
m)
|
||||||
|
|||||||
10
mkpkg.sh
10
mkpkg.sh
@@ -53,11 +53,17 @@ case "$1" in
|
|||||||
make deb
|
make deb
|
||||||
cd $ReleaseDir/"$1"s/$RelArch
|
cd $ReleaseDir/"$1"s/$RelArch
|
||||||
rm -f omc-md5sum.txt
|
rm -f omc-md5sum.txt
|
||||||
# rpm --addsign *.rpm
|
md5sum $DebPkgName >omc-md5sum.txt
|
||||||
|
;;
|
||||||
|
badeb)
|
||||||
|
cd $EmsBEDir
|
||||||
|
make badeb
|
||||||
|
cd $ReleaseDir/"$1"s/$RelArch
|
||||||
|
rm -f omc-md5sum.txt
|
||||||
md5sum $DebPkgName >omc-md5sum.txt
|
md5sum $DebPkgName >omc-md5sum.txt
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "make omc package"
|
echo "make omc package"
|
||||||
echo "Usage: $0 rpm|deb <db>"
|
echo "Usage: $0 rpm|deb|badeb <db>"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
Reference in New Issue
Block a user