patch 4.0

tools/ob-configserver/Makefile

@@ -1,51 +0,0 @@
-include Makefile.common
-
-.PHONY: all test clean build configserver
-
-default: clean fmt build
-
-build: build-debug
-
-build-debug: set-debug-flags configserver
-
-build-release: set-release-flags configserver
-
-set-debug-flags:
-	@echo Build with debug flags
-	$(eval LDFLAGS += $(LDFLAGS_DEBUG))
-
-set-release-flags:
-	@echo Build with release flags
-	$(eval LDFLAGS += -s -w)
-	$(eval LDFLAGS += $(LDFLAGS_RELEASE))
-
-configserver:
-	$(GOBUILD) $(GO_RACE_FLAG) -ldflags '$(OB_CONFIGSERVER_LDFLAGS)' -o bin/ob-configserver cmd/main.go
-
-test:
-	$(GOTEST) $(GOTEST_PACKAGES)
-
-fmt:
-	@gofmt -s -w $(filter-out , $(GOFILES))
-
-fmt-check:
-	@if [ -z "$(UNFMT_FILES)" ]; then \
-		echo "gofmt check passed"; \
-		exit 0; \
-    else \
-    	echo "gofmt check failed, not formatted files:"; \
-    	echo "$(UNFMT_FILES)" | tr -s " " "\n"; \
-    	exit 1; \
-    fi
-
-tidy:
-	$(GO) mod tidy
-
-vet:
-	go vet $$(go list ./...)
-
-clean:
-	rm -rf $(GOCOVERAGE_FILE)
-	rm -rf tests/mock/*
-	rm -rf bin/ob-configserver
-	$(GO) clean -i ./...

tools/ob-configserver/rpm/ob-configserver-build.sh

@@ -2,8 +2,7 @@
 
 PROJECT_DIR=$1
 PROJECT_NAME=$2
-VERSION=$3
-RELEASE=$4
+RELEASE=$3
 
 CUR_DIR=$(dirname $(readlink -f "$0"))
 TOP_DIR=$CUR_DIR/.rpm_build
@@ -16,7 +15,6 @@ mkdir -p $TOP_DIR/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 # build rpm
 cd $CUR_DIR
 export PROJECT_NAME=${PROJECT_NAME}
-export VERSION=${VERSION}
 export RELEASE=${RELEASE}
 rpmbuild --define "_topdir $TOP_DIR" -bb $PROJECT_NAME.spec
 find $TOP_DIR/ -name "*.rpm" -exec mv {} . 2>/dev/null \;