Merge remote-tracking branch 'origin/main' into multi-tenant
This commit is contained in:
12
makefile
12
makefile
@@ -64,23 +64,23 @@ endif
|
||||
.PHONY: all $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) $(Data2htmlBin)
|
||||
all: $(RESTAGENT) $(CRONTASK) $(SshSvcBin) $(CapTraceBin) $(Data2htmlBin)
|
||||
cd $(RestagentDir)
|
||||
go build -o $(RESTAGENT) -v -ldflags "-X 'be.ems/lib/conifg.Version=$(RelVer)' \
|
||||
go build -o $(RESTAGENT) -v -ldflags "-s -w -X 'be.ems/lib/conifg.Version=$(RelVer)' \
|
||||
-X '$(LibDir)/conifg.BuildTime=`date`' \
|
||||
-X '$(LibDir)/conifg.GoVer=`go version`'"
|
||||
cd $(CrontaskDir)
|
||||
go build -o $(CRONTASK) -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \
|
||||
go build -o $(CRONTASK) -v -ldflags "-s -w -X '$(LibDir)/conifg.Version=$(RelVer)' \
|
||||
-X '$(LibDir)/conifg.BuildTime=`date`' \
|
||||
-X '$(LibDir)/conifg.GoVer=`go version`'"
|
||||
cd $(SshSvcDir)
|
||||
go build -o $(SshSvcBin) -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \
|
||||
go build -o $(SshSvcBin) -v -ldflags "-s -w -X '$(LibDir)/conifg.Version=$(RelVer)' \
|
||||
-X '$(LibDir)/conifg.BuildTime=`date`' \
|
||||
-X '$(LibDir)/conifg.GoVer=`go version`'"
|
||||
cd $(CapTraceDir)
|
||||
go build -o $(CapTraceBin) -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \
|
||||
go build -o $(CapTraceBin) -v -ldflags "-s -w -X '$(LibDir)/conifg.Version=$(RelVer)' \
|
||||
-X '$(LibDir)/conifg.BuildTime=`date`' \
|
||||
-X '$(LibDir)/conifg.GoVer=`go version`'"
|
||||
cd $(Data2htmlDir)
|
||||
go build -o $(Data2htmlBin) -v -ldflags "-X '$(LibDir)/conifg.Version=$(RelVer)' \
|
||||
go build -o $(Data2htmlBin) -v -ldflags "-s -w -X '$(LibDir)/conifg.Version=$(RelVer)' \
|
||||
-X '$(LibDir)/conifg.BuildTime=`date`' \
|
||||
-X '$(LibDir)/conifg.GoVer=`go version`'"
|
||||
|
||||
@@ -128,7 +128,7 @@ deb: $(BINNAME)
|
||||
chmod +x $(DebBuildDir)/usr/local/omc/bin/*
|
||||
#sed -i.bak 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control
|
||||
sed -i 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control
|
||||
perl -0777 -i -pe 's/ne:\n user: root/ne:\n user: manager/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)
|
||||
|
||||
rpm: $(BINNAME)
|
||||
|
||||
Reference in New Issue
Block a user