diff options
| author | François Andriot <[email protected]> | 2022-05-15 09:16:54 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2022-05-15 09:29:57 +0200 |
| commit | 39aa474cf470a180a73ba313340b4c45d608930c (patch) | |
| tree | fabfdc2a42a15602648977859c725a82e423a7a3 /redhat/docker/el6 | |
| parent | 11b59120b4b653f7915851ada6673e3d38b032f8 (diff) | |
| download | tde-packaging-39aa474cf470a180a73ba313340b4c45d608930c.tar.gz tde-packaging-39aa474cf470a180a73ba313340b4c45d608930c.zip | |
RPM: update build scripts for rhel6 to use cmake3
Signed-off-by: François Andriot <[email protected]>
Diffstat (limited to 'redhat/docker/el6')
| -rw-r--r-- | redhat/docker/el6/Dockerfile.i686 | 3 | ||||
| -rw-r--r-- | redhat/docker/el6/Dockerfile.x86_64 | 1 | ||||
| -rw-r--r-- | redhat/docker/el6/packages | 2 | ||||
| -rw-r--r-- | redhat/docker/el6/rpmmacros | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 5e8c9827d..2ed6aa216 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -12,6 +12,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ && rpm -Uvh http://repo/repo/archives/centos/6/os/i386/Packages/wget-1.12-10.el6.i686.rpm \ && rm -fv /etc/yum.repos.d/*.repo \ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \ + && sed -i /etc/yum.repos.d/*.repo -e "s|https://|http://|g" \ && setarch i686 yum -y clean all \ && setarch i686 yum -y update \ && rm -fv /etc/yum.repos.d/CentOS-*.repo \ @@ -38,7 +39,7 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN sudo rpm -Uvh http://repo/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm +RUN sudo rpm -Uvh http://xh61v/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64 index cbde1af99..e59ee8957 100644 --- a/redhat/docker/el6/Dockerfile.x86_64 +++ b/redhat/docker/el6/Dockerfile.x86_64 @@ -14,6 +14,7 @@ RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \ && yum -y clean all \ && yum -y update \ + && rm -fv /etc/yum.repos.d/CentOS-*.repo \ && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ && yum -y install $(</packages) diff --git a/redhat/docker/el6/packages b/redhat/docker/el6/packages index 7f9db04e2..9c05dc013 100644 --- a/redhat/docker/el6/packages +++ b/redhat/docker/el6/packages @@ -9,6 +9,7 @@ binutils-devel bison boost-devel bzip2-devel +byacc ccache ccrtp-devel cdparanoia @@ -19,6 +20,7 @@ clamav clamav-devel clucene-core-devel cmake +cmake3 commoncpp2-devel cpp cppunit-devel diff --git a/redhat/docker/el6/rpmmacros b/redhat/docker/el6/rpmmacros index 3b33ecbc0..74a547ddb 100644 --- a/redhat/docker/el6/rpmmacros +++ b/redhat/docker/el6/rpmmacros @@ -3,3 +3,4 @@ %_smp_mflags -j8 %jobs 8 %_topdir /home/trinity/rpmbuild +%cmake %cmake3 |