diff --git a/makefile b/makefile index 8e0abff1..07d31ef9 100644 --- a/makefile +++ b/makefile @@ -107,7 +107,7 @@ dist: --exclude=../crontask/crontask \ --exclude=../initems/initems -prep_deb: $(BINNAME) +pre_build: $(BINNAME) # clear build cache rm -rf $(FrontBuildDir)/front/* rm -rf $(DebFEBuildDir)/front/* @@ -134,7 +134,7 @@ replace_chinese: @find $(DebBuildOMCDir)/etc/db -type f -name '*.sql' -exec sed -i '' 's/[一-龥]//g' {} + @echo "Replace all chinese charecter." -deb: prep_deb +deb: pre_build cp -rf $(CustomizedDir)/agt.d $(DebBuildOMCDir)/static cp -rf $(CustomizedDir)/omc.d $(DebBuildOMCDir)/static #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 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 $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d #cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ diff --git a/misc/setomc.sh b/misc/setomc.sh index d1c83353..955292d4 100755 --- a/misc/setomc.sh +++ b/misc/setomc.sh @@ -20,6 +20,9 @@ check_args() { elif [ "${C_ARG_LOWER}" == "omc" ]; then C_ARG_UPPER="OMC" 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 ;; m) diff --git a/mkpkg.sh b/mkpkg.sh index 322a7654..58ce1b0b 100755 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -53,11 +53,17 @@ case "$1" in make deb cd $ReleaseDir/"$1"s/$RelArch 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 ;; *) echo "make omc package" - echo "Usage: $0 rpm|deb " + echo "Usage: $0 rpm|deb|badeb " ;; esac \ No newline at end of file