cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

packaging: add short has and branch name in package version for unofficial builds

Browse source
This commit is contained in:
Serge van Ginderachter 2014-08-06 13:00:14 +02:00
parent e90d2573d1
commit df8dfdce06
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -39,6 +39,11 @@ VERSION := $(shell cat VERSION)
# Get the branch information from git # Get the branch information from git
ifneq ($(shell which git),) ifneq ($(shell which git),)
GIT_DATE := $(shell git log -n 1 --format="%ai") GIT_DATE := $(shell git log -n 1 --format="%ai")
GIT_HASH := $(shell git log -n 1 --format="%h")
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD | sed 's/[-_.]//g')
GITINFO = .$(GIT_HASH).$(GIT_BRANCH)
else
GITINFO = ''
endif endif
ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD'),1) ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD'),1)
@ -60,7 +65,7 @@ ifeq ($(OFFICIAL),yes)
DEBUILD_OPTS += -k$(DEBSIGN_KEYID) DEBUILD_OPTS += -k$(DEBSIGN_KEYID)
endif endif
else else
DEB_RELEASE = 0.git$(DATE) DEB_RELEASE = 0.git$(DATE)$(GITINFO)
# Do not sign unofficial builds # Do not sign unofficial builds
DEBUILD_OPTS += -uc -us DEBUILD_OPTS += -uc -us
DPUT_OPTS += -u DPUT_OPTS += -u
@ -76,7 +81,7 @@ RPMSPEC = $(RPMSPECDIR)/ansible.spec
RPMDIST = $(shell rpm --eval '%{?dist}') RPMDIST = $(shell rpm --eval '%{?dist}')
RPMRELEASE = 1 RPMRELEASE = 1
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
RPMRELEASE = 0.git$(DATE) RPMRELEASE = 0.git$(DATE)$(GITINFO)
endif endif
RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)" RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)"