From: Sebastien Douheret Date: Fri, 23 Jun 2017 17:10:44 +0000 (+0200) Subject: Set SUB_VERSION as current commit ID. X-Git-Tag: v0.1.0-beta~11 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=d3cb7d647c0f3c3aad9a60a8655b1f5427bbd778;p=src%2Fxds%2Fxds-server.git Set SUB_VERSION as current commit ID. --- diff --git a/Makefile b/Makefile index 916b133..d088c5d 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ ifeq ($(origin SUB_VERSION), undefined) VERSION := $(firstword $(subst -, ,$(SUB_VERSION))) SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION))) else - SUB_VERSION := $(shell git describe --tags --always | sed 's/^v//') + SUB_VERSION := $(shell git rev-parse --short HEAD) ifeq ($(SUB_VERSION), ) SUB_VERSION := unknown-dev endif @@ -55,7 +55,6 @@ LOCAL_BINDIR := $(ROOT_SRCDIR)/bin LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS} PACKAGE_DIR := $(ROOT_SRCDIR)/package - export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ) export PATH := $(PATH):$(LOCAL_TOOLSDIR)