##// END OF EJS Templates
packaging: refactor "fedora29" target to a single more generic "fedora" target...
Mads Kiilerich -
r43677:0b65f18e stable
parent child Browse files
Show More
@@ -189,7 +189,7 b' packaging_targets := \\'
189 189 docker-centos7 \
190 190 docker-debian-jessie \
191 191 docker-debian-stretch \
192 docker-fedora29 \
192 docker-fedora \
193 193 docker-ubuntu-trusty \
194 194 docker-ubuntu-trusty-ppa \
195 195 docker-ubuntu-xenial \
@@ -198,7 +198,7 b' packaging_targets := \\'
198 198 docker-ubuntu-artful-ppa \
199 199 docker-ubuntu-bionic \
200 200 docker-ubuntu-bionic-ppa \
201 fedora29 \
201 fedora \
202 202 linux-wheels \
203 203 linux-wheels-x86_64 \
204 204 linux-wheels-i686 \
@@ -11,8 +11,7 b' UBUNTU_CODENAMES := \\'
11 11 cosmic \
12 12 disco
13 13
14 FEDORA_RELEASES := \
15 29
14 FEDORA_RELEASE := 29
16 15
17 16 CENTOS_RELEASES := \
18 17 5 \
@@ -31,8 +30,8 b' help:'
31 30 @echo 'docker-debian-{$(strip $(DEBIAN_CODENAMES))}'
32 31 @echo ' Build Debian packages specific to a Debian distro using Docker.'
33 32 @echo ''
34 @echo 'docker-fedora{$(strip $(FEDORA_RELEASES))}'
35 @echo ' Build an RPM for a specific Fedora version using Docker.'
33 @echo 'docker-fedora'
34 @echo ' Build an RPM for a Fedora $(FEDORA_RELEASE) using Docker.'
36 35 @echo ''
37 36 @echo 'docker-ubuntu-{$(strip $(UBUNTU_CODENAMES))}'
38 37 @echo ' Build Debian package specific to an Ubuntu distro using Docker.'
@@ -56,8 +55,8 b' help:'
56 55 @echo 'centos{$(strip $(CENTOS_RELEASES))}'
57 56 @echo ' Build an RPM for a specific CentOS version locally'
58 57 @echo ''
59 @echo 'fedora{$(strip $(FEDORA_RELEASES))}'
60 @echo ' Build an RPM for a specific Fedora version locally'
58 @echo 'fedora'
59 @echo ' Build an RPM for Fedora $(FEDORA_RELEASE) locally'
61 60
62 61 .PHONY: help
63 62
@@ -94,22 +93,17 b' endef'
94 93 $(foreach codename,$(UBUNTU_CODENAMES),$(eval $(call ubuntu_targets,$(codename))))
95 94
96 95 # Fedora targets.
97 define fedora_targets
98 .PHONY: fedora$(1)
99 fedora$(1):
100 mkdir -p $$(HGROOT)/packages/fedora$(1)
96 .PHONY: fedora
97 fedora:
98 mkdir -p $(HGROOT)/packages/fedora$(FEDORA_RELEASE)
101 99 ./buildrpm
102 cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/fedora$(1)
103 cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/fedora$(1)
100 cp $(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $(HGROOT)/packages/fedora$(FEDORA_RELEASE)
101 cp $(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $(HGROOT)/packages/fedora$(FEDORA_RELEASE)
104 102 rm -rf $(HGROOT)/rpmbuild
105 103
106 .PHONY: docker-fedora$(1)
107 docker-fedora$(1):
108 ./dockerrpm fedora$(1)
109
110 endef
111
112 $(foreach release,$(FEDORA_RELEASES),$(eval $(call fedora_targets,$(release))))
104 .PHONY: docker-fedora
105 docker-fedora:
106 ./dockerrpm fedora$(FEDORA_RELEASE)
113 107
114 108 # CentOS targets.
115 109 define centos_targets
General Comments 0
You need to be logged in to leave comments. Login now