diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-02-16 11:59:53 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-02-16 18:14:33 +0000 |
| commit | bc1d25bb19c1664b5669c13d6ff2811571284d27 (patch) | |
| tree | 9692bc42d4a096c90582bbe9a859e2602a942878 | |
| parent | f2041b51f39855f288f8feb486c5726587ebe90a (diff) | |
| download | podman-bc1d25bb19c1664b5669c13d6ff2811571284d27.tar.gz podman-bc1d25bb19c1664b5669c13d6ff2811571284d27.tar.bz2 podman-bc1d25bb19c1664b5669c13d6ff2811571284d27.zip | |
Remove last traces of old version scheme
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #345
Approved by: rhatdan
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | PODMAN_VERSION | 1 |
2 files changed, 1 insertions, 5 deletions
@@ -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 |