Patchwork D9292: packaging: remove centos5 and centos6 support

login
register
mail settings
Submitter phabricator
Date Nov. 11, 2020, 9:03 p.m.
Message ID <differential-rev-PHID-DREV-yzlhrpc4alvyouco3lfr-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47567/
State Superseded
Headers show

Comments

phabricator - Nov. 11, 2020, 9:03 p.m.
Mathiasdm created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9292

AFFECTED FILES
  Makefile
  contrib/packaging/Makefile
  contrib/packaging/docker/centos5
  contrib/packaging/docker/centos6

CHANGE DETAILS




To: Mathiasdm, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/contrib/packaging/docker/centos6 b/contrib/packaging/docker/centos6
deleted file mode 100644
--- a/contrib/packaging/docker/centos6
+++ /dev/null
@@ -1,24 +0,0 @@ 
-FROM centos:centos6
-
-RUN groupadd -g %GID% build && \
-    useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
-
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build \
-	tar
-
-# For creating repo meta data
-RUN yum install -y createrepo
-
-# For python
-RUN yum install -y \
-	bzip2-devel \
-	ncurses-devel \
-	openssl-devel \
-	readline-devel \
-	zlib-devel
diff --git a/contrib/packaging/docker/centos5 b/contrib/packaging/docker/centos5
deleted file mode 100644
--- a/contrib/packaging/docker/centos5
+++ /dev/null
@@ -1,27 +0,0 @@ 
-FROM centos:centos5
-
-RUN groupadd -g %GID% build && \
-    useradd -u %UID% -g %GID% -s /bin/bash -d /build -m build
-
-RUN \
-	sed -i 's/^mirrorlist/#mirrorlist/' /etc/yum.repos.d/*.repo && \
-	sed -i 's/^#\(baseurl=\)http:\/\/mirror.centos.org\/centos/\1http:\/\/vault.centos.org/' /etc/yum.repos.d/*.repo && \
-	sed -i 's/\$releasever/5.11/' /etc/yum.repos.d/*.repo
-
-RUN yum install -y \
-	gcc \
-	gettext \
-	make \
-	python-devel \
-	python-docutils \
-	rpm-build \
-	tar
-
-# For creating repo meta data
-RUN yum install -y \
-	bzip2-devel \
-	createrepo \
-	ncurses-devel \
-	openssl-devel \
-	readline-devel \
-	zlib-devel
diff --git a/contrib/packaging/Makefile b/contrib/packaging/Makefile
--- a/contrib/packaging/Makefile
+++ b/contrib/packaging/Makefile
@@ -14,14 +14,12 @@ 
 FEDORA_RELEASE := 31
 
 CENTOS_RELEASES := \
-  5 \
-  6 \
   7 \
   8
 
 # Build a Python for these CentOS releases.
-CENTOS_WITH_PYTHON_RELEASES := 5 6
-CENTOS_WITH_NONVERSIONED_PYTHON := 5 6 7
+CENTOS_WITH_PYTHON_RELEASES :=
+CENTOS_WITH_NONVERSIONED_PYTHON :=
 
 help:
 	@echo 'Packaging Make Targets'
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -190,13 +190,9 @@ 
 # Packaging targets
 
 packaging_targets := \
-  centos5 \
-  centos6 \
   centos7 \
   centos8 \
   deb \
-  docker-centos5 \
-  docker-centos6 \
   docker-centos7 \
   docker-centos8 \
   docker-debian-bullseye \