ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

makefile: change distro to el8 

Change the default dist value to el8 for consistency, since many of the
upcoming ceph-ansible builds will be based on RHEL 8.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
pull/3621/head
Ken Dreyer 2019-02-19 13:32:27 -07:00 committed by mergify[bot]
parent 0cf590244a
commit d2591b8b40
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -7,16 +7,16 @@ NAME = ceph-ansible
# Examples: # Examples:
# #
# A "git describe" value of "v2.2.0beta1" would create an NVR # A "git describe" value of "v2.2.0beta1" would create an NVR
# "ceph-ansible-2.2.0-0.beta1.1.el7" # "ceph-ansible-2.2.0-0.beta1.1.el8"
# #
# A "git describe" value of "v2.2.0rc1" would create an NVR # A "git describe" value of "v2.2.0rc1" would create an NVR
# "ceph-ansible-2.2.0-0.rc1.1.el7" # "ceph-ansible-2.2.0-0.rc1.1.el8"
# #
# A "git describe" value of "v2.2.0rc1-1-gc465f85" would create an NVR # A "git describe" value of "v2.2.0rc1-1-gc465f85" would create an NVR
# "ceph-ansible-2.2.0-0.rc1.1.gc465f85.el7" # "ceph-ansible-2.2.0-0.rc1.1.gc465f85.el8"
# #
# A "git describe" value of "v2.2.0" creates an NVR # A "git describe" value of "v2.2.0" creates an NVR
# "ceph-ansible-2.2.0-1.el7" # "ceph-ansible-2.2.0-1.el8"
TAG := $(shell git describe --tags --abbrev=0 --match 'v*') TAG := $(shell git describe --tags --abbrev=0 --match 'v*')
VERSION := $(shell echo $(TAG) | sed 's/^v//') VERSION := $(shell echo $(TAG) | sed 's/^v//')
@ -46,7 +46,7 @@ ifneq (,$(shell echo $(VERSION) | grep [a-zA-Z]))
$(error cannot translate Git tag version $(VERSION) to an RPM NVR) $(error cannot translate Git tag version $(VERSION) to an RPM NVR)
endif endif
NVR := $(NAME)-$(VERSION)-$(RELEASE).el7 NVR := $(NAME)-$(VERSION)-$(RELEASE).el8
all: srpm all: srpm
@ -77,12 +77,12 @@ srpm: dist spec
--define "_topdir ." \ --define "_topdir ." \
--define "_sourcedir ." \ --define "_sourcedir ." \
--define "_srcrpmdir ." \ --define "_srcrpmdir ." \
--define "dist .el7" --define "dist .el8"
rpm: dist srpm rpm: dist srpm
mock -r epel-7-x86_64 rebuild $(NVR).src.rpm \ mock -r epel-7-x86_64 rebuild $(NVR).src.rpm \
--resultdir=. \ --resultdir=. \
--define "dist .el7" --define "dist .el8"
tag: tag:
$(eval BRANCH := $(shell git rev-parse --abbrev-ref HEAD)) $(eval BRANCH := $(shell git rev-parse --abbrev-ref HEAD))