From bc1d25bb19c1664b5669c13d6ff2811571284d27 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 16 Feb 2018 11:59:53 -0500 Subject: Remove last traces of old version scheme Signed-off-by: Matthew Heon Closes: #345 Approved by: rhatdan --- Makefile | 5 +---- PODMAN_VERSION | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 PODMAN_VERSION diff --git a/Makefile b/Makefile index 3e337a431..a1f495aad 100644 --- a/Makefile +++ b/Makefile @@ -24,8 +24,6 @@ COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true) GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}") BUILD_INFO := $(shell date +%s) -PODMAN_VERSION := ${shell cat ./PODMAN_VERSION} - # If GOPATH not specified, use one in the local directory ifeq ($(GOPATH),) export GOPATH := $(CURDIR)/_output @@ -38,9 +36,8 @@ GOPKGBASEDIR := $(shell dirname "$(GOPKGDIR)") VPATH := $(VPATH):$(GOPATH) SHRINKFLAGS := -s -w BASE_LDFLAGS := ${SHRINKFLAGS} -X main.gitCommit=${GIT_COMMIT} -X main.buildInfo=${BUILD_INFO} -PODMAN_LDFLAGS := -X main.podmanVersion=${PODMAN_VERSION} LDFLAGS := -ldflags '${BASE_LDFLAGS}' -LDFLAGS_PODMAN := -ldflags '${BASE_LDFLAGS} ${PODMAN_LDFLAGS}' +LDFLAGS_PODMAN := -ldflags '${BASE_LDFLAGS}' BOX="fedora_atomic" diff --git a/PODMAN_VERSION b/PODMAN_VERSION deleted file mode 100644 index 3b04cfb60..000000000 --- a/PODMAN_VERSION +++ /dev/null @@ -1 +0,0 @@ -0.2 -- cgit v1.2.3-54-g00ecf