diff options
Diffstat (limited to 'redhat/docker')
24 files changed, 344 insertions, 12 deletions
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 78dd12598..a39c59cdd 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -218,6 +218,7 @@ usbutils valgrind wireless-tools-devel xine-lib-devel +xkeyboard-config-devel xmlto xorg-x11-font-utils xscreensaver diff --git a/redhat/docker/el7/rpmmacros b/redhat/docker/el7/rpmmacros index e0a64de43..f47c6c067 100644 --- a/redhat/docker/el7/rpmmacros +++ b/redhat/docker/el7/rpmmacros @@ -2,3 +2,5 @@ %_smp_mflags -j8 %jobs 8 %cmake %cmake3 +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/el8/Dockerfile.x86_64 b/redhat/docker/el8/Dockerfile.x86_64 index f2e00c95c..2bc43a412 100644 --- a/redhat/docker/el8/Dockerfile.x86_64 +++ b/redhat/docker/el8/Dockerfile.x86_64 @@ -32,6 +32,10 @@ RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE # Fix utempter detection RUN chmod a+r /usr/libexec/utempter/utempter +# Fix python3.6 detection (tdebindings; kvirc) +RUN ln -sfv python3.6m /usr/include/python3.6 \ + && ln -sfv python3 /usr/bin/python + # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 06283e94e..38d1c15b6 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -26,6 +26,8 @@ createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +djvu-libre +djvu-libre-devel docbook2X doxygen emacs @@ -187,8 +189,6 @@ ppp psutils pulseaudio-libs-devel pylibacl -python2 -python2-devel python3 python3-devel python3-pyxattr @@ -224,6 +224,7 @@ valgrind wget wireless-tools-devel xine-lib-devel +xkeyboard-config-devel xmlto xorg-x11-font-utils xscreensaver diff --git a/redhat/docker/el8/rpmmacros b/redhat/docker/el8/rpmmacros index dc2cb7e68..d2d495cbe 100644 --- a/redhat/docker/el8/rpmmacros +++ b/redhat/docker/el8/rpmmacros @@ -3,3 +3,5 @@ %jobs 8 %_debugsource_packages %nil %_debugsource_template %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages index da83cd4e3..9103ab3c2 100644 --- a/redhat/docker/el9/packages +++ b/redhat/docker/el9/packages @@ -27,6 +27,8 @@ createrepo_c cryptsetup-devel cups-devel dbus-glib-devel +djvu-libre +djvu-libre-devel docbook2X doxygen emacs @@ -215,6 +217,7 @@ usbutils valgrind wget xine-lib-devel +xkeyboard-config-devel xmlto xorg-x11-server-utils xorg-x11-util-macros diff --git a/redhat/docker/el9/rpmmacros b/redhat/docker/el9/rpmmacros index a6c71dccc..67367b01a 100644 --- a/redhat/docker/el9/rpmmacros +++ b/redhat/docker/el9/rpmmacros @@ -4,3 +4,5 @@ %__cmake_in_source_build 1 %_debugsource_packages %nil %_debugsource_template %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/f39/packages b/redhat/docker/f39/packages index 8f51317f3..4a76d8eeb 100644 --- a/redhat/docker/f39/packages +++ b/redhat/docker/f39/packages @@ -232,6 +232,7 @@ usbutils valgrind xbase-devel xine-lib-devel +xkeyboard-config-devel xmedcon xmedcon-devel xmlto diff --git a/redhat/docker/f39/rpmmacros b/redhat/docker/f39/rpmmacros index 206994877..e199a1097 100644 --- a/redhat/docker/f39/rpmmacros +++ b/redhat/docker/f39/rpmmacros @@ -8,3 +8,4 @@ %_debugsource_template %nil %source_date_epoch_from_changelog 0 %python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/f40/Dockerfile.x86_64 b/redhat/docker/f40/Dockerfile.x86_64 new file mode 100644 index 000000000..3e8ac0557 --- /dev/null +++ b/redhat/docker/f40/Dockerfile.x86_64 @@ -0,0 +1,41 @@ +FROM fedora:40 + +ARG TDE_VERSION=14.1.1 +ARG ARCH=x86_64 + +# Fix DNF database corruption +# Add RPMFUSION repository +# Install Trinity build dependencies +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" \ + && rm -fv /etc/yum.repos.d/*{rawhide,testing}* \ + && sed -i /etc/yum.repos.d/fedora{,-updates}.repo -e "1,12s|enabled=0|enabled=1|" -e "s|\$releasever|40|g" \ + && dnf -y install dnf-plugin-ovl findutils \ + && dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-40.noarch.rpm \ + && dnf -y --enableplugin=ovl update \ + && dnf -y --enableplugin=ovl install --skip-broken $(</packages) + +# Add YUM repository for locally built packages +COPY rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter \ + && chmod 777 /tmp + +# Add non-root user to build packages +RUN useradd -m -s /bin/bash -u 1000 trinity \ + && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers \ + && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc + +USER trinity +COPY rpmmacros /home/trinity/.rpmmacros + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/35/Everything/source/tree/Packages/w/wireless-tools-29-28.fc35.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/wireless-tools.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/wireless-tools{,-devel}-29* + +RUN rpm -i https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/l/libnjb-2.2.7-24.fc36.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/libnjb.spec -e "s|libusb-devel|libusb1-devel|" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libnjb.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libnjb{,-devel}-2* diff --git a/redhat/docker/f40/packages b/redhat/docker/f40/packages new file mode 100644 index 000000000..4a76d8eeb --- /dev/null +++ b/redhat/docker/f40/packages @@ -0,0 +1,242 @@ +alsa-lib-devel +aspell +aspell-devel +audiofile-devel +autotrace +avahi-devel +bdftopcf +bind-devel +binutils-devel +bison +boost-devel +boost-python3-devel +byacc +bzip2-devel +ccache +cdparanoia +cdparanoia-devel +chmlib-devel +chrpath +clamav +clamav-devel +clucene-core-devel +cmake +cpp +cppunit-devel +crda +createrepo_c +cryptsetup-devel +cups-devel +dbus-glib-devel +djvulibre +djvulibre-devel +dnf-plugin-ovl +docbook2X +doxygen +dssi-devel +esound-devel +exempi-devel +exiv2-devel +fdupes +fedora-rpm-macros +ffmpeg-devel +fftw-devel +file-devel +flac-devel +flex-static +fontpackages-devel +fribidi-devel +gcc +gcc-c++ +geoip-devel +gettext-devel +giflib-devel +glib-devel +gmime-devel +gmp-devel +gnokii-devel +gperf +gpgme-devel +gphoto2-devel +GraphicsMagick-devel +graphviz +gsl-devel +gstreamer1-devel +gstreamer1-plugins-base-devel +gtk2-devel +gtk3-devel +gtk+-devel +gtk-doc +guile-devel +harfbuzz-devel +heimdal-devel +hspell-devel +htdig +html2ps +iceauth +icu +ImageMagick-devel +imake +imlib2-devel +intltool +jack-audio-connection-kit-devel +jasper-devel +java-1.8.0-openjdk-devel +java-devel +java-openjdk +lame-devel +lcms-devel +less +libacl-devel +libblkid-devel +libcap-devel +libcdio-devel +libcdio-paranoia-devel +libconfig-devel +libcurl-devel +libdb-cxx-devel +libdb-devel +libdvdread-devel +libfontenc-devel +libgadu-devel +libgpod-devel +libgsf-devel +libical-devel +libidn-devel +libifp-devel +liblo-devel +liblrdf-devel +libmad-devel +libmng-devel +libmp4v2-devel +libmpcdec-devel +libmtp-devel +libmusicbrainz5-devel +libnjb-devel +libnsl2-devel +libofx-devel +libogg-devel +libotr-devel +libpaper-devel +libpqxx-devel +libqalculate-devel +libraw1394-devel +librsvg2 +librsvg2-tools +libsamplerate-devel +libsmbclient-devel +libsndfile-devel +libssh-devel +libssh2-devel +libtheora-devel +libtiff-devel +libtirpc-devel +libtool +libtool-ltdl-devel +libudev-devel +libudisks2-devel +libusb-compat-0.1-devel +libusb1-devel +libutempter-devel +libuuid-devel +libv4l-devel +libvisual-devel +libvncserver-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 +lirc-devel +lm_sensors-devel +meanwhile-devel +mesa-libGL-devel +mftrace +mysql-devel +nas-devel +neon-devel +netpbm-progs +NetworkManager-libnm-devel +net-snmp-devel +net-tools +nspr-devel +ocaml +ocaml(compiler) +ocaml-facile-devel +OpenEXR-devel +openldap-devel +opensc +openslp-devel +opensp-devel +ortp-devel +pam-devel +pciutils-devel +pcre-devel +pcsc-lite-devel +pcsc-perl +perl +perl-devel +perl(ExtUtils::MakeMaker) +perl(PAR::Packer) +perl(XML::Parser) +pilot-link-devel +pkcs11-helper-devel +pkgconfig(pygtk-2.0) +polkit-devel +poppler-devel +postgresql +postgresql-private-devel +postgresql-server-devel +ppp +pulseaudio-libs-devel +python3.11 +python3.11-devel +qt4-devel +recode +redhat-rpm-config +rpcgen +rpm-build +ruby +ruby-devel +sane-backends-devel +scons +SDL-devel +selinux-policy-devel +speex-devel +sqlite-devel +subversion-devel +sudo +swig +sword-devel +t1lib-devel +t1utils +taglib-devel +texinfo +texlive-newunicodechar +torsocks +transfig +udisks-devel +unixODBC-devel +usbutils +valgrind +xbase-devel +xine-lib-devel +xkeyboard-config-devel +xmedcon +xmedcon-devel +xmlto +xorg-x11-font-utils +xscreensaver +xscreensaver-extras +xz-devel diff --git a/redhat/docker/f40/rpmbuild.repo b/redhat/docker/f40/rpmbuild.repo new file mode 100644 index 000000000..750290651 --- /dev/null +++ b/redhat/docker/f40/rpmbuild.repo @@ -0,0 +1,11 @@ +[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/f40/rpmmacros b/redhat/docker/f40/rpmmacros new file mode 100644 index 000000000..5c930ad58 --- /dev/null +++ b/redhat/docker/f40/rpmmacros @@ -0,0 +1,11 @@ +%dist .fc40 +%_smp_mflags -j8 +%jobs 8 +%__brp_remove_la_files %nil +%__cmake_builddir %nil +%__cmake_in_source_build 1 +%_debugsource_packages %nil +%_debugsource_template %nil +%source_date_epoch_from_changelog 0 +%python python3 +%__python /usr/bin/python3.11 diff --git a/redhat/docker/mageia32.sh b/redhat/docker/mageia32.sh index 29afb4b59..01aa1f672 100755 --- a/redhat/docker/mageia32.sh +++ b/redhat/docker/mageia32.sh @@ -3,6 +3,7 @@ NAME="mageia32" VERSION="$1" # E.g: '26' IMAGE="${NAME}:${VERSION}" +TAR="${NAME}-${VERSION}.tar" INSTALLROOT="/dev/shm/${IMAGE}" sudo rm -rf "${INSTALLROOT}" @@ -12,8 +13,8 @@ setarch i686 sudo urpmi \ --auto \ bash vim urpmi mageia-release-common -sudo tar -C "${INSTALLROOT}" -c . >"${IMAGE}.tar" +sudo tar -C "${INSTALLROOT}" -c . >"${TAR}" sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" -docker import "${IMAGE}.tar" "${IMAGE}" +docker import "${TAR}" "${IMAGE}" diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 index d0f67751d..21c9a7d60 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -193,6 +193,7 @@ nas-devel neon-devel netpbm net-snmp-devel +net-tools notification-daemon ocaml ocaml-facile-devel diff --git a/redhat/docker/mga9/rpmmacros b/redhat/docker/mga9/rpmmacros index a92be537d..e0f078bca 100644 --- a/redhat/docker/mga9/rpmmacros +++ b/redhat/docker/mga9/rpmmacros @@ -6,3 +6,5 @@ %_debugsource_packages %nil %_debugsource_template %nil %_vpath_builddir . +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/oss155/Dockerfile.x86_64 b/redhat/docker/oss155/Dockerfile.x86_64 index 8bc7e0bef..11162caaf 100644 --- a/redhat/docker/oss155/Dockerfile.x86_64 +++ b/redhat/docker/oss155/Dockerfile.x86_64 @@ -30,7 +30,7 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch # Install heimdal development files -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.5/repo/oss/src/libheimdal-7.8.0-bp155.2.3.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.5/repo/oss/src/libheimdal-7.8.0-bp155.2.7.src.rpm \ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ diff --git a/redhat/docker/oss155/rpmmacros b/redhat/docker/oss155/rpmmacros index 3a9593ace..7fe3f58e6 100644 --- a/redhat/docker/oss155/rpmmacros +++ b/redhat/docker/oss155/rpmmacros @@ -3,3 +3,5 @@ %jobs 8 %sle_version 150500 %_build_insert_debug_package %nil +%python python3 +%__python /usr/bin/python3 diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 9c445bffe..6908d881d 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -26,14 +26,14 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch # Install heimdal development files -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.4.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ && setarch ${ARCH} rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install # Add lilypond (i686 only) -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.1.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.5.src.rpm \ && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 07873cdb7..71fe6b7e5 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -26,8 +26,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch # Install heimdal development files -RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.4.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.5.src.rpm \ && wget -nv -O "${HOME}/rpmbuild/SOURCES/heimdal-7.8.0.tar.gz" "https://github.com/heimdal/heimdal/releases/download/heimdal-7.8.0/heimdal-7.8.0.tar.gz" \ && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|^|#|" \ + && export ac_cv_sys_large_files=no \ + && export ac_cv_sys_file_offset_bits=no \ && rpmbuild -bc ${HOME}/rpmbuild/SPECS/libheimdal.spec \ && sudo make -C ${HOME}/rpmbuild/BUILD/heimdal-7.8.0/tools/ install diff --git a/redhat/docker/osstw/rpmmacros b/redhat/docker/osstw/rpmmacros index 174b79fb3..37788e61e 100644 --- a/redhat/docker/osstw/rpmmacros +++ b/redhat/docker/osstw/rpmmacros @@ -1,4 +1,5 @@ %dist .osstw %_smp_mflags -j8 %jobs 8 +%python python3 %__python %__python3 diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index 1b428daf0..42ab539cc 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex NAME="pclinuxos" -VERSION="${1:-2023}" # E.g: '2020' +VERSION="${1:-2024}" # E.g: '2020' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 10bb88882..8c5e5dc91 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -1,4 +1,4 @@ -FROM pclinuxos:2023 +FROM pclinuxos:2024 ARG TDE_VERSION=14.1.1 ARG ARCH=x86_64 @@ -26,8 +26,7 @@ COPY genla.sh /usr/bin/genla.sh RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \ && genla.sh libjpeg \ && genla.sh liblcms \ - && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la \ - && ln -sf /usr/lib64/libglvnd/libGL.so /usr/lib64/libGL.so + && genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la # Add non-root user to build packages RUN rm -rf /home/trinity \ diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index a8b78eb0d..5c9fcc2e4 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -3,3 +3,5 @@ %jobs 8 %pclinuxos 2022 %configure %configure2_5x +%python python3 +%__python /usr/bin/python3 |