[cpp-linbuild] 08/25: Fix CentOS6 support

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository cpp-linbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-linbuild.git;a=commit;h=69bd0fa20cbc81a36a85431f6c7eedbea3812b2a

commit 69bd0fa20cbc81a36a85431f6c7eedbea3812b2a
Author: John W. O'Brien <john at saltant.com>
AuthorDate: Tue Dec 22 18:44:21 2020 -0500

    Fix CentOS6 support
---
 Makefile                                |  3 +--
 os/centos6/image/CentOS-Base.repo       |  2 ++
 os/centos6/image/CentOS-Vault-Base.repo | 17 +++++++++++++++++
 os/centos6/image/Dockerfile             |  4 +++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7605d18..30f4ef3 100644
--- a/Makefile
+++ b/Makefile
@@ -136,11 +136,10 @@ distfiles: $(foreach component,$(COMPONENTS),$(SOURCEDIR)/$($(component)_DISTFIL
 #
 
 PLATFORMS=\
+	centos6 \
 	centos7 \
 	centos8
 
-# XXX took centos6 out because it just went EoL and the upstream repos broke
-
 # To add a new platform, create the following
 #	os/$OS/
 #		image/
diff --git a/os/centos6/image/CentOS-Base.repo b/os/centos6/image/CentOS-Base.repo
new file mode 100644
index 0000000..5421e95
--- /dev/null
+++ b/os/centos6/image/CentOS-Base.repo
@@ -0,0 +1,2 @@
+# Install an empty file to disable defunct default repos following
+# CentOS 6 EoL 2020-11-30
diff --git a/os/centos6/image/CentOS-Vault-Base.repo b/os/centos6/image/CentOS-Vault-Base.repo
new file mode 100644
index 0000000..f595077
--- /dev/null
+++ b/os/centos6/image/CentOS-Vault-Base.repo
@@ -0,0 +1,17 @@
+[base]
+name=CentOS-6.10 - Base
+baseurl=http://vault.centos.org/6.10/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+
+[extras]
+name=CentOS-6.10 - Base
+baseurl=http://vault.centos.org/6.10/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
+
+[updates]
+name=CentOS-6.10 - Base
+baseurl=http://vault.centos.org/6.10/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6
diff --git a/os/centos6/image/Dockerfile b/os/centos6/image/Dockerfile
index ce49965..92a0d0f 100644
--- a/os/centos6/image/Dockerfile
+++ b/os/centos6/image/Dockerfile
@@ -2,6 +2,8 @@ FROM centos:6.10
 
 MAINTAINER John W. O'Brien <john at saltant.com>
 
+COPY *.repo /etc/yum.repos.d/
+
 RUN yum -y update \
     && yum -y install \
         autoconf automake boost-devel chrpath doxygen gcc-c++ git groff \
@@ -29,6 +31,6 @@ RUN echo "%_rpmdir ${EXT_BASE}/out/RPMS" >> ~/.rpmmacros
 RUN echo "%_srcrpmdir ${EXT_BASE}/out/SRPMS" >> ~/.rpmmacros
 RUN echo "%packager PLACE HOLDER <USER at EXAMPLE.COM>" >> ~/.rpmmacros
 
-COPY . ${BUILD_BASE}
+COPY *.sh ${BUILD_BASE}/
 
 WORKDIR ${EXT_BASE}/in/SPECS

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.