diff --git a/makefile b/makefile index f1a19af4..9bc6124d 100644 --- a/makefile +++ b/makefile @@ -65,17 +65,23 @@ dist: --exclude=../initems/initems deb: $(BINNAME) - cp -rf ./restagent/$(RESTAGENT) $(BuildDir)/omc/bin - cp -rf ./crontask/$(CRONTASK) $(BuildDir)/omc/bin - cp -rf $(MiscDir)/* $(BuildDir)/omc/bin - cp -rf $(DBSQLSrcDir)/*.sql $(BuildDir)/omc/etc/db + cp -rf ./restagent/$(RESTAGENT) $(BinDir) + cp -rf ./crontask/$(CRONTASK) $(BinDir) + cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir) + cp -rf $(MiscDir)/ne-hosts $(BinDir) + cp -rf $(MiscDir)/* $(BinDir) + rm -rf $(BinDir2)/ne-hosts + cp -rf $(ConfigEtcDir)/* $(BuildDir)/omc/etc/ + cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db/ rm -rf $(FrontBuildDir)/* - unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null + mkdir -p $(FrontBuildDir)/front + cp -rf $(EmsFEDir)/* $(FrontBuildDir)/front >/dev/null + chmod 755 $(BinDir)/* chmod 755 $(BuildDir)/omc/bin/* chmod 755 $(DebBuildDir)/DEBIAN/* cp -rf $(BuildDir)/omc/* $(DebBuildDir)/usr/local/omc/ chmod +x $(DebBuildDir)/usr/local/omc/bin/* - 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/ dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION).$(PLATFORM).deb diff --git a/mkpkg.sh b/mkpkg.sh index cc7ca6f1..e66a461b 100644 --- a/mkpkg.sh +++ b/mkpkg.sh @@ -39,6 +39,10 @@ case "$1" in deb) cd $EmsBEDir make deb + cd $ReleaseDir/"$1"s/$RelArch + rm -f omc-md5sum.txt +# rpm --addsign *.rpm + md5sum *.deb >omc-md5sum.txt ;; *) echo "mkpkg"