From effbf509eea4f37a1a8660242769ed1746b67ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sat, 30 Jan 2021 23:53:31 +0100 Subject: RPM: update build scripts for Fedora 33 / CentOS 8 --- redhat/docker/el5/Dockerfile.i686 | 2 +- redhat/docker/el5/Dockerfile.x86_64 | 96 +++++++++++---- redhat/docker/el5/centos-5.repo | 30 ----- redhat/docker/el5/epel-5.repo | 5 - redhat/docker/el5/packages | 232 ++++++++++++++++++++++++++++++++++++ redhat/docker/el5/packages.base | 6 - redhat/docker/el5/packages.trinity | 198 ------------------------------ redhat/docker/el5/repoforge-5.repo | 5 - redhat/docker/el5/rpmbuild.repo | 11 -- redhat/docker/el5/rpmmacros | 1 + 10 files changed, 308 insertions(+), 278 deletions(-) delete mode 100644 redhat/docker/el5/centos-5.repo delete mode 100644 redhat/docker/el5/epel-5.repo create mode 100644 redhat/docker/el5/packages delete mode 100644 redhat/docker/el5/packages.base delete mode 100644 redhat/docker/el5/packages.trinity delete mode 100644 redhat/docker/el5/repoforge-5.repo delete mode 100644 redhat/docker/el5/rpmbuild.repo (limited to 'redhat/docker/el5') diff --git a/redhat/docker/el5/Dockerfile.i686 b/redhat/docker/el5/Dockerfile.i686 index 39400e044..41fa7813e 100644 --- a/redhat/docker/el5/Dockerfile.i686 +++ b/redhat/docker/el5/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM centos32:5 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.1.0 ARG ARCH=i686 # Add local repositories diff --git a/redhat/docker/el5/Dockerfile.x86_64 b/redhat/docker/el5/Dockerfile.x86_64 index fc184f677..9b6418787 100644 --- a/redhat/docker/el5/Dockerfile.x86_64 +++ b/redhat/docker/el5/Dockerfile.x86_64 @@ -1,33 +1,85 @@ FROM centos:5 -ARG TDE_VERSION=14.0.7 +ARG TDE_VERSION=14.1.0 ARG ARCH=x86_64 # Add local repositories -RUN rm -f /etc/yum.repos.d/*.repo -ADD centos-5.repo /etc/yum.repos.d/centos-5.repo -ADD epel-5.repo /etc/yum.repos.d/epel-5.repo -ADD repoforge-5.repo /etc/yum.repos.d/repoforge-5.repo - -# Install Trinity build dependencies -ADD packages.trinity /etc/yum.repos.d/packages -RUN echo "multilib_policy=best" >>"/etc/yum.conf" -RUN yum install -y setarch -RUN setarch ${ARCH} yum update -y -RUN setarch ${ARCH} yum install -y $(>/etc/yum.conf \ + && cd /etc/yum.repos.d \ + && rm -f *.repo \ + && curl http://repo/repo/{centos5,epel5,repoforge5}.repo >repos.repo \ + && rpm -e --nodeps --justdb libselinux \ + && yum -y update \ + && yum -y install $(/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" # 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 -ADD rpmmacros /home/trinity/.rpmmacros +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -# Distro-specific patches -RUN 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|" +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros +RUN mkdir -p ${HOME}/rpmbuild/{BUILD,BUILDROOT,SOURCES,SPECS,RPMS/noarch,RPMS/${ARCH},SRPMS} + +# Build development packages +RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/file-5.04-30.el6.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/file.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/file{,-libs,-devel}-5*.rpm + +RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/binutils-2.20.51.0.2-5.48.el6.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/binutils.spec --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/binutils{,-devel}-2*.rpm + +RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/p/pcsc-perl-1.4.14-2.el6.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/pcsc-perl.spec -e "s|%license|%doc|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/pcsc-perl.spec --define "__isa_bits 64" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm + +RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/6/SRPMS/Packages/s/sword-1.7.3-2.el6.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/sword.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/sword{,-devel}-1*.rpm + +RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/gnuchess-5.07-14.1.el6.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/gnuchess.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/gnuchess-5*.rpm + +RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-1.015-4.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s|%license|%doc|" -e "/perl(AutoLoader)/ s|^|#|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm + +RUN rpm -i --nomd5 http://vault.centos.org/7.7.1908/os/Source/SPackages/perl-Module-ScanDeps-1.10-3.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "/^make test/ s|^|#|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-Module-ScanDeps.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Module-ScanDeps-*.rpm + +RUN rpm -i --nomd5 http://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer-1.041-2.el7.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" -e "/^Summary:/ s|$|\nGroup: Development/Languages|" -e "/URL:/ s|$|\nBuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)|" -e "s|desktop-file-install|desktop-file-install --vendor=''|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "_unpackaged_files_terminate_build 0" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps + +RPM rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/exempi-2.1.0-5.el6.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/exempi.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/exempi{,-devel}-2*.rpm + +RUN rpm -i --nomd5 http://vault.centos.org/6.10/os/Source/SPackages/pilot-link-0.12.4-6.el6.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/pilot-link.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel}-0*.rpm + + +# sudo rm -f /usr/bin/gcc && sudo ln -sf /usr/bin/gcc44 /usr/bin/gcc +# sudo rm -f /usr/bin/g++ && sudo ln -sf /usr/bin/g++44 /usr/bin/g++ +# sudo rm -f /usr/bin/c++ && sudo ln -sf /usr/bin/g++44 /usr/bin/c++ diff --git a/redhat/docker/el5/centos-5.repo b/redhat/docker/el5/centos-5.repo deleted file mode 100644 index 135077b21..000000000 --- a/redhat/docker/el5/centos-5.repo +++ /dev/null @@ -1,30 +0,0 @@ -[centos-5-base] -name=CentOS-5 - Base -baseurl=http://repo/repo/archives/centos/5/os/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 -enabled=1 - -#released updates -[centos-5-updates] -name=CentOS-5 - Updates -baseurl=http://repo/repo/archives/centos/5/updates/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 -enabled=1 - -#additional packages that may be useful -[centos-5-extras] -name=CentOS-5 - Extras -baseurl=http://repo/repo/archives/centos/5/extras/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 -enabled=1 - -#additional packages that extend functionality of existing packages -[centos-5-centosplus] -name=CentOS-5 - Plus -baseurl=http://repo/repo/archives/centos/5/centosplus/$basearch/ -gpgcheck=1 -gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5 -enabled=1 diff --git a/redhat/docker/el5/epel-5.repo b/redhat/docker/el5/epel-5.repo deleted file mode 100644 index f110938f8..000000000 --- a/redhat/docker/el5/epel-5.repo +++ /dev/null @@ -1,5 +0,0 @@ -[epel] -name=epel -baseurl=http://repo/repo/archives/epel/5/$basearch/ -enabled=1 -gpgcheck=0 diff --git a/redhat/docker/el5/packages b/redhat/docker/el5/packages new file mode 100644 index 000000000..dbbe2f017 --- /dev/null +++ b/redhat/docker/el5/packages @@ -0,0 +1,232 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bash +bind-devel +binutils-devel +bison +bluez-libs-devel +boost-devel +bzip2-devel +ccache +ccrtp-devel +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +cln-devel +clucene-core-devel +cmake +commoncpp2-devel +compat-gcc-34-g77 +cpp +cppunit-devel +createrepo +cryptsetup-luks-devel +ctags +cups-devel +curl-devel +db4-devel +dbus-glib-devel +dejagnu +dirmngr +dosfstools +doxygen +emacs +esound-devel +exiv2-devel +expect +fdupes +ffmpeg-devel +fftw-devel +fipscheck +flac-devel +fontpackages-devel +fribidi-devel +gamin-devel +gcc +gcc-c++ +gcc-gfortran +gcc-java +gcc44 +gcc44-c++ +GeoIP-devel +gettext-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +gsl-devel +gstreamer-devel +gstreamer-plugins-base-devel +gtk2-devel +gtk+-devel +gtk-doc +guile-devel +hal-devel +hspell-devel +htdig +html2ps +icu +ImageMagick-devel +imake +imlib-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.4.2-gcj-compat-devel +java-1.7.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +libacl-devel +libarchive-devel +libart_lgpl-devel +libcap-devel +libcdio-devel +libdrm-devel +libdvdread-devel +libfontenc-devel +libgcj-devel +libgpod-devel +libgsf-devel +libgssapi-devel +libical-devel +libicu-devel +libidn-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmusicbrainz-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libraw1394-devel +librsvg2-devel +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtool +libtool-ltdl-devel +libtunepimp-devel +libutempter-devel +libvisual-devel +libvorbis-devel +libwmf-devel +libwpd-devel +libXaw-devel +libXcomposite-devel +libXdamage-devel +libXdmcp-devel +libxkbfile-devel +libXScrnSaver-devel +libxslt-devel +libXtst-devel +libXv-devel +libXxf86dga-devel +libXxf86vm-devel +libyaz-devel +libzrtpcpp-devel +lm_sensors-devel +meanwhile-devel +mysql-devel +nas-devel +ncurses-devel +neon-devel +netpbm-progs +net-snmp-devel +NetworkManager-glib-devel +ocaml +OpenEXR-devel +openldap24-libs-devel +openldap-devel +opensc +openslp-devel +opensp-devel +openssh +openssh-clients +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-lite-libs +perl +perl-devel +perl(Archive::Zip) +perl(ExtUtils::MakeMaker) +perl(Getopt::ArgvFile) +perl(inc::Module::Install) +perl(IPC::Run3) +perl(Module::Pluggable) +perl(Module::Signature) +perl(prefork) +perl(Test::Pod) +perl(XML::Parser) +php-cli +pilot-link-devel +pinentry +pkcs11-helper-devel +poppler-devel +postgresql-devel +pth-devel +python-docutils +rdesktop +recode +redhat-rpm-config +rpm-build +rsh +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +setarch +sharutils +sip-devel +speex-devel +sqlite-devel +subversion-devel +sudo +t1lib-devel +t1utils +taglib-devel +texinfo +texinfo-tex +torsocks +transfig +unixODBC-devel +usbutils +valgrind +vim-enhanced +wireless-tools-devel +xine-lib-devel +xinetd +xmlto +xorg-x11-font-utils +xorg-x11-server-utils +xscreensaver +xscreensaver-extras +xscreensaver-gl-base +xscreensaver-gl-extras +xulrunner-devel +xz-devel +yum +yum-plugin-ovl +yum-utils diff --git a/redhat/docker/el5/packages.base b/redhat/docker/el5/packages.base deleted file mode 100644 index 7765aa5df..000000000 --- a/redhat/docker/el5/packages.base +++ /dev/null @@ -1,6 +0,0 @@ -bash -perl -setarch -vim-enhanced -yum -yum-plugin-ovl diff --git a/redhat/docker/el5/packages.trinity b/redhat/docker/el5/packages.trinity deleted file mode 100644 index 3e21635b2..000000000 --- a/redhat/docker/el5/packages.trinity +++ /dev/null @@ -1,198 +0,0 @@ -alsa-lib-devel -aspell -aspell-devel -audiofile-devel -autotrace -avahi-devel -bind-devel -binutils-devel -bison -boost-devel -bzip2-devel -ccache -ccrtp-devel -cdparanoia -cdparanoia-devel -chmlib-devel -chrpath -clamav -clamav-devel -clucene-core-devel -cmake -commoncpp2-devel -compat-gcc-34-g77 -cpp -cppunit-devel -createrepo -cryptsetup-luks-devel -cups-devel -curl-devel -db4-devel -dbus-glib-devel -dejagnu -doxygen -emacs -esound-devel -exiv2-devel -expect -fdupes -ffmpeg-devel -fftw-devel -flac-devel -fontpackages-devel -fribidi-devel -gamin-devel -gcc -gcc-c++ -gcc-gfortran -gcc-java -gettext-devel -glib-devel -gmime-devel -gmp-devel -gnokii-devel -gperf -gpgme-devel -gphoto2-devel -GraphicsMagick-devel -gsl-devel -gstreamer-devel -gstreamer-plugins-base-devel -gtk2-devel -gtk+-devel -gtk-doc -guile-devel -hal-devel -hspell-devel -htdig -html2ps -icu -ImageMagick-devel -imake -imlib-devel -jack-audio-connection-kit-devel -jasper-devel -java-1.4.2-gcj-compat-devel -java-1.7.0-openjdk-devel -java-devel -java-openjdk -lame-devel -lcms-devel -libacl-devel -libarchive-devel -libart_lgpl-devel -libcap-devel -libcdio-devel -libdrm-devel -libdvdread-devel -libfontenc-devel -libgcj-devel -libgpod-devel -libgsf-devel -libgssapi-devel -libical-devel -libicu-devel -libidn-devel -liblrdf-devel -libmad-devel -libmng-devel -libmp4v2-devel -libmpcdec-devel -libmusicbrainz-devel -libofx-devel -libogg-devel -libotr-devel -libpaper-devel -libpqxx-devel -libraw1394-devel -librsvg2-devel -libsamplerate-devel -libsmbclient-devel -libsndfile-devel -libssh2-devel -libtheora-devel -libtiff-devel -libtool -libtool-ltdl-devel -libtunepimp-devel -libutempter-devel -libvisual-devel -libvorbis-devel -libwmf-devel -libwpd-devel -libXaw-devel -libXcomposite-devel -libXdamage-devel -libXdmcp-devel -libxkbfile-devel -libXScrnSaver-devel -libxslt-devel -libXtst-devel -libXv-devel -libXxf86dga-devel -libXxf86vm-devel -libzrtpcpp-devel -lm_sensors-devel -meanwhile-devel -mysql-devel -nas-devel -ncurses-devel -neon-devel -netpbm-progs -net-snmp-devel -NetworkManager-glib-devel -ocaml -OpenEXR-devel -openldap-devel -openldap24-libs-devel -opensc -openslp-devel -opensp-devel -pam-devel -pciutils-devel -pcre-devel -pcsc-lite-devel -perl -perl(ExtUtils::MakeMaker) -perl(XML::Parser) -pilot-link-devel -pkcs11-helper-devel -poppler-devel -postgresql-devel -pth-devel -python-docutils -recode -redhat-rpm-config -rpm-build -rsh -ruby -ruby-devel -sane-backends-devel -scons -SDL-devel -setarch -sip-devel -speex-devel -sqlite-devel -sudo -subversion-devel -t1lib-devel -t1utils -taglib-devel -texinfo -texinfo-tex -transfig -unixODBC-devel -usbutils -valgrind -wireless-tools-devel -xine-lib-devel -xmlto -xorg-x11-font-utils -xorg-x11-server-utils -xscreensaver -xscreensaver-gl-base -xscreensaver-gl-extras -xscreensaver-extras -xulrunner-devel -xz-devel diff --git a/redhat/docker/el5/repoforge-5.repo b/redhat/docker/el5/repoforge-5.repo deleted file mode 100644 index a08fc0ba4..000000000 --- a/redhat/docker/el5/repoforge-5.repo +++ /dev/null @@ -1,5 +0,0 @@ -[dag] -name=dag -baseurl=http://repo/repo/repoforge/redhat/el5/en/$basearch/dag/ -enabled=1 -gpgcheck=0 diff --git a/redhat/docker/el5/rpmbuild.repo b/redhat/docker/el5/rpmbuild.repo deleted file mode 100644 index 750290651..000000000 --- a/redhat/docker/el5/rpmbuild.repo +++ /dev/null @@ -1,11 +0,0 @@ -[rpmbuild.${ARCH}] -name=rpmbuild.${ARCH} -baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} -enabled=1 -gpgcheck=0 - -[rpmbuild.noarch] -name=rpmbuild.noarch -baseurl=file:///home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch -enabled=1 -gpgcheck=0 diff --git a/redhat/docker/el5/rpmmacros b/redhat/docker/el5/rpmmacros index 05170915d..4f292dab3 100644 --- a/redhat/docker/el5/rpmmacros +++ b/redhat/docker/el5/rpmmacros @@ -3,3 +3,4 @@ %_smp_mflags -j8 %jobs 8 %_topdir /home/trinity/rpmbuild +%_gpg_name Trinity -- cgit v1.2.1