contrib: refer to RHEL and derivatives instead of CentOS specifically
Differential Revision: https://phab.mercurial-scm.org/D12182
--- a/Makefile Mon Feb 14 11:32:03 2022 +0100
+++ b/Makefile Tue Feb 15 15:33:33 2022 +0100
@@ -204,11 +204,11 @@
# Packaging targets
packaging_targets := \
- centos7 \
- centos8 \
+ rhel7 \
+ rhel8 \
deb \
- docker-centos7 \
- docker-centos8 \
+ docker-rhel7 \
+ docker-rhel8 \
docker-debian-bullseye \
docker-debian-buster \
docker-debian-stretch \
--- a/contrib/packaging/Makefile Mon Feb 14 11:32:03 2022 +0100
+++ b/contrib/packaging/Makefile Tue Feb 15 15:33:33 2022 +0100
@@ -13,20 +13,20 @@
FEDORA_RELEASE := 31
-CENTOS_RELEASES := \
+RHEL_RELEASES := \
7 \
8
-# Build a Python for these CentOS releases.
-CENTOS_WITH_PYTHON_RELEASES :=
-CENTOS_WITH_NONVERSIONED_PYTHON :=
-CENTOS_WITH_36_DOCUTILS := 7
+# Build a Python for these RHEL (and derivatives) releases.
+RHEL_WITH_PYTHON_RELEASES :=
+RHEL_WITH_NONVERSIONED_PYTHON :=
+RHEL_WITH_36_DOCUTILS := 7
help:
@echo 'Packaging Make Targets'
@echo ''
- @echo 'docker-centos{$(strip $(CENTOS_RELEASES))}'
- @echo ' Build an RPM for a specific CentOS version using Docker.'
+ @echo 'docker-rhel{$(strip $(RHEL_RELEASES))}'
+ @echo ' Build an RPM for a specific RHEL/derivative version using Docker.'
@echo ''
@echo 'docker-debian-{$(strip $(DEBIAN_CODENAMES))}'
@echo ' Build Debian packages specific to a Debian distro using Docker.'
@@ -53,8 +53,8 @@
@echo 'ppa'
@echo ' Build a Debian source package locally targeting the current system'
@echo ''
- @echo 'centos{$(strip $(CENTOS_RELEASES))}'
- @echo ' Build an RPM for a specific CentOS version locally'
+ @echo 'rhel{$(strip $(RHEL_RELEASES))}'
+ @echo ' Build an RPM for a specific RHEL/derivative version locally'
@echo ''
@echo 'fedora'
@echo ' Build an RPM for Fedora $(FEDORA_RELEASE) locally'
@@ -106,22 +106,22 @@
docker-fedora:
./dockerrpm fedora$(FEDORA_RELEASE)
-# CentOS targets.
-define centos_targets
-.PHONY: centos$(1)
-centos$(1):
- mkdir -p $$(HGROOT)/packages/centos$(1)
- ./buildrpm $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(CENTOS_WITH_NONVERSIONED_PYTHON)),--python python,))$$(if $$(filter $(1),$$(CENTOS_WITH_36_DOCUTILS)), --docutilspackage python36-docutils,)
- cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/centos$(1)
- cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/centos$(1)
+# RHEL targets.
+define rhel_targets
+.PHONY: rhel$(1)
+rhel$(1):
+ mkdir -p $$(HGROOT)/packages/rhel$(1)
+ ./buildrpm $$(if $$(filter $(1),$$(RHEL_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(RHEL_WITH_NONVERSIONED_PYTHON)),--python python,))$$(if $$(filter $(1),$$(RHEL_WITH_36_DOCUTILS)), --docutilspackage python36-docutils,)
+ cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/rhel$(1)
+ cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/rhel$(1)
-.PHONY: docker-centos$(1)
-docker-centos$(1):
- ./dockerrpm centos$(1) $$(if $$(filter $(1),$$(CENTOS_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(CENTOS_WITH_NONVERSIONED_PYTHON)),--python python,))$$(if $$(filter $(1),$$(CENTOS_WITH_36_DOCUTILS)), --docutilspackage python36-docutils,)
+.PHONY: docker-rhel$(1)
+docker-rhel$(1):
+ ./dockerrpm rhel$(1) $$(if $$(filter $(1),$$(RHEL_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(RHEL_WITH_NONVERSIONED_PYTHON)),--python python,))$$(if $$(filter $(1),$$(RHEL_WITH_36_DOCUTILS)), --docutilspackage python36-docutils,)
endef
-$(foreach release,$(CENTOS_RELEASES),$(eval $(call centos_targets,$(release))))
+$(foreach release,$(RHEL_RELEASES),$(eval $(call rhel_targets,$(release))))
.PHONY: linux-wheels
linux-wheels: linux-wheels-x86_64 linux-wheels-i686
--- a/contrib/packaging/docker/centos7 Mon Feb 14 11:32:03 2022 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-FROM centos:centos7
-
-RUN groupadd -g %GID% build && \
- useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
-
-RUN yum install -y epel-release
-RUN yum install -y \
- gcc \
- gettext \
- make \
- python3-devel \
- python36-docutils \
- rpm-build \
- tar
-
-# For creating repo meta data
-RUN yum install -y createrepo
-
-# For rust extensions
-RUN yum install -y cargo
--- a/contrib/packaging/docker/centos8 Mon Feb 14 11:32:03 2022 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-FROM rockylinux/rockylinux:8
-
-RUN groupadd -g %GID% build && \
- useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
-
-RUN yum install -y \
- gcc \
- gettext \
- make \
- python3-devel \
- python3-docutils \
- rpm-build
-
-# For creating repo meta data
-RUN yum install -y createrepo
-
-# For rust extensions
-RUN yum install -y cargo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/rhel7 Tue Feb 15 15:33:33 2022 +0100
@@ -0,0 +1,20 @@
+FROM centos:centos7
+
+RUN groupadd -g %GID% build && \
+ useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
+
+RUN yum install -y epel-release
+RUN yum install -y \
+ gcc \
+ gettext \
+ make \
+ python3-devel \
+ python36-docutils \
+ rpm-build \
+ tar
+
+# For creating repo meta data
+RUN yum install -y createrepo
+
+# For rust extensions
+RUN yum install -y cargo
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/packaging/docker/rhel8 Tue Feb 15 15:33:33 2022 +0100
@@ -0,0 +1,18 @@
+FROM rockylinux/rockylinux:8
+
+RUN groupadd -g %GID% build && \
+ useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
+
+RUN yum install -y \
+ gcc \
+ gettext \
+ make \
+ python3-devel \
+ python3-docutils \
+ rpm-build
+
+# For creating repo meta data
+RUN yum install -y createrepo
+
+# For rust extensions
+RUN yum install -y cargo