From 191dbe0c32b56e88be8e5253f65833470e2eee0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 1 Jun 2020 19:01:43 +0200 Subject: RPM: update build scripts --- redhat/docker/el7/Dockerfile.x86_64 | 41 +++++++++++++++++++++---------------- redhat/docker/el7/packages | 2 ++ 2 files changed, 25 insertions(+), 18 deletions(-) (limited to 'redhat/docker/el7') diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index c350bd995..7693ded63 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -1,23 +1,22 @@ FROM centos:7 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Enable proxy RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" -# Update distribution packages -RUN yum -y update - # Add EPEL repository -RUN yum -y install epel-release - -# Add NUX repository -RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm +# Add RPMFUSION repository +RUN rpm -Uvh \ + https://fr2.rpmfind.net/linux/epel/7/x86_64/Packages/e/epel-release-7-12.noarch.rpm \ + https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm # Install Trinity build dependencies ADD packages /packages -RUN yum -y install $(/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" +RUN chmod a+r /usr/libexec/utempter/utempter \ + && sed -i "/usr/include/jasper/jas_math.h" -e "/#include / s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" \ + && ln -sf libmp4v2.so /usr/lib64/libmp4.so # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity -RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity ADD rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm +RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/source/SRPMS/d/dirmngr-1.1.1-5.fc21.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/dirmngr-1*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm + +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/r/rdesktop-1.9.0-2.fc32.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm -RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/30/Everything/source/tree/Packages/y/yaz-5.14.11-17.fc30.src.rpm --define "_pkgdocdir /usr/share/doc/yaz" -RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libyaz{,-devel}-5*.rpm +RUN rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/32/Everything/source/tree/Packages/p/pilot-link-0.12.5-44.fc32.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 969834482..efc202d44 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -7,6 +7,7 @@ avahi-devel bind-devel binutils-devel bison +bluez-libs-devel boost-devel bzip2-devel ccache @@ -163,6 +164,7 @@ pcsc-lite-devel pcsc-perl perl perl-devel +perl-generators perl(ExtUtils::MakeMaker) perl(PAR::Packer) perl(XML::Parser) -- cgit v1.2.1