opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 09:58:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove last traces of old version scheme

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #345
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-02-16 11:59:53 -05:00
committed by Atomic Bot
parent f2041b51f3
commit bc1d25bb19
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -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}") GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
BUILD_INFO := $(shell date +%s) BUILD_INFO := $(shell date +%s)
PODMAN_VERSION := ${shell cat ./PODMAN_VERSION}
# If GOPATH not specified, use one in the local directory # If GOPATH not specified, use one in the local directory
ifeq ($(GOPATH),) ifeq ($(GOPATH),)
export GOPATH := $(CURDIR)/_output export GOPATH := $(CURDIR)/_output
@ -38,9 +36,8 @@ GOPKGBASEDIR := $(shell dirname "$(GOPKGDIR)")
VPATH := $(VPATH):$(GOPATH) VPATH := $(VPATH):$(GOPATH)
SHRINKFLAGS := -s -w SHRINKFLAGS := -s -w
BASE_LDFLAGS := ${SHRINKFLAGS} -X main.gitCommit=${GIT_COMMIT} -X main.buildInfo=${BUILD_INFO} 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 := -ldflags '${BASE_LDFLAGS}'
LDFLAGS_PODMAN := -ldflags '${BASE_LDFLAGS} ${PODMAN_LDFLAGS}' LDFLAGS_PODMAN := -ldflags '${BASE_LDFLAGS}'
BOX="fedora_atomic" BOX="fedora_atomic"

1
PODMAN_VERSION
View File

@ -1 +0,0 @@
0.2