diff options
Diffstat (limited to 'redhat/docker')
25 files changed, 107 insertions, 25 deletions
diff --git a/redhat/docker/build.sh b/redhat/docker/build.sh index a53ffd06a..da21a69f5 100755 --- a/redhat/docker/build.sh +++ b/redhat/docker/build.sh @@ -7,6 +7,7 @@ ARCH="$3" [ -z "${TDE_VERSION}" ] && TDE_VERSION="14.1.2" [ -z "${ARCH}" ] && ARCH="x86_64" [ -x /usr/bin/podman ] && DOCKER=podman || DOCKER=docker +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}" FILE="${HOME}/tde/docker/${IMAGE}.tar.gz" @@ -20,11 +21,11 @@ else echo "Building new Docker image '${IMAGE}'." ${DOCKER} build -t "${IMAGE}" -f "${DISTRIB}/Dockerfile.${ARCH}" --build-arg TDE_VERSION="${TDE_VERSION}" --build-arg ARCH="${ARCH}" "${DISTRIB}" echo "Saving image to '${FILE}'" - ${DOCKER} image save "${IMAGE}" | pigz >"${FILE}" + ${DOCKER} image save "${IMAGE}" | ${GZIP} >"${FILE}" fi # Strip 'localhost/' prefix from image tag -if ! docker images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then - docker image tag "localhost/${IMAGE}" "${IMAGE}" - #docker image remove "localhost/${IMAGE}" +if ! ${DOCKER} images | while read name tag blah; do echo "${name}:${tag}"; done | grep -q "^${IMAGE}$"; then + ${DOCKER} image tag "localhost/${IMAGE}" "${IMAGE}" + #${DOCKER} image remove "localhost/${IMAGE}" fi diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 1366cfb18..12ce82bca 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -8,11 +8,14 @@ ARG ARCH=x86_64 # Add RPMFUSION repository # Install Trinity build dependencies COPY packages /packages -RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ - && yum -y install epel-release \ - && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \ +RUN set -x \ + && cd /etc/yum.repos.d \ + && rm -fv *.repo \ + && curl http://repo/repo/{centos7,epel7,rpmfusion7}.repo >repos.repo \ + && sed -i "repos.repo" -e "s|https://|http://|" \ && yum -y clean all \ && yum -y update \ + && rm -fv {CentOS,epel}-*.repo \ && yum -y install $(</packages) # Add YUM repository for locally built packages @@ -48,3 +51,14 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pilot-link-0.12.5-50.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pilot-link{,-devel,-libs}-0*.rpm + +#RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \ +# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \ +# && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/%forgeautosetup/ s|.*|%autosetup -p1 -n libunibreak-libunibreak_6_1|" -e "s|%forgesource|libunibreak-libunibreak_6_1.tar.gz|" \ +# && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec --define "forgemeta %nil" \ +# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm + +RUN set -x \ + && rpmbuild --rebuild https://archives.fedoraproject.org/pub/fedora/linux/releases/39/Everything/source/tree/Packages/l/libunibreak-4.0-13.fc39.src.rpm --define "ldconfig_scriptlets %post -p /sbin/ldconfig" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{4,devel}*.rpm + diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index a39c59cdd..67be667a7 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -133,6 +133,7 @@ libutempter-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel @@ -167,6 +168,7 @@ opensp-devel pam-devel pciutils-devel pcre-devel +pcre2-devel pcsc-lite-devel pcsc-perl perl diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index cea7e8a72..173497991 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -91,6 +91,7 @@ libconfig-devel libcurl-devel libdb-devel libdb-cxx-devel +libdrm-devel libdvdread-devel libfontenc-devel libgpod-devel @@ -130,6 +131,7 @@ libutempter-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel @@ -148,6 +150,7 @@ libudisks2-devel libusb-devel lirc-devel lm_sensors-devel +mesa-libGL-devel mysql-devel neon-devel netpbm-progs diff --git a/redhat/docker/el9/Dockerfile.x86_64 b/redhat/docker/el9/Dockerfile.x86_64 index 5fb5a4c01..17188ff89 100644 --- a/redhat/docker/el9/Dockerfile.x86_64 +++ b/redhat/docker/el9/Dockerfile.x86_64 @@ -99,3 +99,8 @@ RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/lin RUN rpmbuild --rebuild https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/36/Everything/source/tree/Packages/p/pcsc-perl-1.4.14-19.fc36.src.rpm \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/pcsc-perl-1*.rpm + +RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/10/Everything/source/tree/Packages/l/libunibreak-6.1-2.el10_0.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/libunibreak.spec -e "/^Patch:.*offline_files.patch/ s/^Patch:/Patch1:/" -e "/^Patch:.*remove_unused_var.patch/ s/^Patch:/Patch2:/" \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/libunibreak.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libunibreak-{6,devel}*.rpm diff --git a/redhat/docker/el9/packages b/redhat/docker/el9/packages index 3d3239b3a..1763a3653 100644 --- a/redhat/docker/el9/packages +++ b/redhat/docker/el9/packages @@ -128,6 +128,7 @@ libuuid-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel diff --git a/redhat/docker/f39/packages b/redhat/docker/f39/packages index 4a76d8eeb..75f39fda1 100644 --- a/redhat/docker/f39/packages +++ b/redhat/docker/f39/packages @@ -135,6 +135,7 @@ libtool libtool-ltdl-devel libudev-devel libudisks2-devel +libunibreak-devel libusb-compat-0.1-devel libusb1-devel libutempter-devel @@ -143,6 +144,7 @@ libv4l-devel libvisual-devel libvncserver-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel diff --git a/redhat/docker/f40/packages b/redhat/docker/f40/packages index 7f1d9cc47..f409831a4 100644 --- a/redhat/docker/f40/packages +++ b/redhat/docker/f40/packages @@ -135,6 +135,7 @@ libtool libtool-ltdl-devel libudev-devel libudisks2-devel +libunibreak-devel libusb-compat-0.1-devel libusb1-devel libutempter-devel diff --git a/redhat/docker/f41/packages b/redhat/docker/f41/packages index 7df12183b..1bd6d53b2 100644 --- a/redhat/docker/f41/packages +++ b/redhat/docker/f41/packages @@ -133,6 +133,7 @@ libtool libtool-ltdl-devel libudev-devel libudisks2-devel +libunibreak-devel libusb-compat-0.1-devel libusb1-devel libutempter-devel diff --git a/redhat/docker/mageia.sh b/redhat/docker/mageia.sh index e0a84588a..7f208caf3 100755 --- a/redhat/docker/mageia.sh +++ b/redhat/docker/mageia.sh @@ -5,6 +5,7 @@ VERSION="${1:-9}" # E.g: '9' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" ARCH="x86_64" +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip sudo rm -rf "${INSTALLROOT}" sudo mkdir -p "${INSTALLROOT}" @@ -29,6 +30,6 @@ sudo rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" docker import "${FILE}" "${IMAGE}" -pigz "${FILE}" +${GZIP} "${FILE}" mkdir -p "${HOME}/tde/docker" mv -fv "${FILE}.gz" "${HOME}/tde/docker" diff --git a/redhat/docker/mga9/packages.i686 b/redhat/docker/mga9/packages.i686 index 01f51270c..1279b7cbb 100644 --- a/redhat/docker/mga9/packages.i686 +++ b/redhat/docker/mga9/packages.i686 @@ -139,6 +139,7 @@ libpx-devel libqalculate-devel libraw1394-devel librsvg +librsvg2-devel libsane1-devel libsmbclient-devel libsm-devel @@ -150,6 +151,7 @@ libtiff-devel libtwolame-devel libudev-devel libungif-devel +libunibreak-devel libusb1.0-devel libutempter libutempter0 @@ -157,6 +159,7 @@ libutempter-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libx11-devel diff --git a/redhat/docker/mga9/packages.x86_64 b/redhat/docker/mga9/packages.x86_64 index 21c9a7d60..89c831306 100644 --- a/redhat/docker/mga9/packages.x86_64 +++ b/redhat/docker/mga9/packages.x86_64 @@ -102,15 +102,18 @@ lib64pcre-devel lib64pkcs11-helper-devel lib64poppler-devel lib64pulseaudio-devel +lib64rsvg2-devel lib64sane1-devel lib64t1lib-devel lib64tiff-devel lib64twolame-devel lib64udev-devel +lib64unibreak-devel lib64usb1.0-devel lib64utempter0 lib64utempter-devel lib64v4l-devel +lib64webp-devel lib64xaw-devel lib64xdg-basedir-devel lib64xi-devel diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv5000/Dockerfile.x86_64 index 37b186710..5665a11cb 100644 --- a/redhat/docker/omv5000/Dockerfile.x86_64 +++ b/redhat/docker/omv5000/Dockerfile.x86_64 @@ -26,7 +26,9 @@ USER trinity COPY rpmmacros /home/trinity/.rpmmacros RUN set -x \ - && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm RUN set -x \ @@ -63,3 +65,7 @@ RUN set -x \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm diff --git a/redhat/docker/omv5000/packages b/redhat/docker/omv5000/packages index 47a126218..9a5216e64 100644 --- a/redhat/docker/omv5000/packages +++ b/redhat/docker/omv5000/packages @@ -60,6 +60,7 @@ java-1.8.0-openjdk java-1.8.0-openjdk-devel java-devel kde-dev-scripts +ladspa-devel less lib64acl-devel lib64alsa-oss-devel @@ -101,6 +102,7 @@ lib64gpg-error-devel lib64gphoto-devel lib64gpod-devel lib64graphicsmagick-devel +lib64gsf-1-devel lib64gstreamer-devel lib64gst-plugins-base1.0-devel lib64gtk+2.0-devel @@ -166,6 +168,7 @@ lib64tirpc-devel lib64twolame-devel lib64udev-devel lib64udisks-devel +lib64unibreak-devel lib64usb-compat0.1-devel lib64usb1.0-devel lib64utempter0 @@ -183,10 +186,13 @@ lib64xkbfile-devel lib64xscrnsaver-devel lib64xslt-devel lib64xtst-devel +lib64xv-devel lib64xxf86dga-devel lib64xxf86vm-devel lib64wrap-devel librsvg +libwebp-devel +libxt-devel lm_sensors-devel mysql-devel nas-devel @@ -217,7 +223,9 @@ perl(Tk) perl(XML::Parser) pilot-link-devel pinentry-gtk2 +pkgconfig(ao) pkgconfig(audiofile) +pkgconfig(libgssglue) pkgconfig(libpng16) postgresql postgresql-devel diff --git a/redhat/docker/omvcooker/Dockerfile.x86_64 b/redhat/docker/omvcooker/Dockerfile.x86_64 index 55f8a0abf..7c6184eb4 100644 --- a/redhat/docker/omvcooker/Dockerfile.x86_64 +++ b/redhat/docker/omvcooker/Dockerfile.x86_64 @@ -26,7 +26,9 @@ USER trinity COPY rpmmacros /home/trinity/.rpmmacros RUN set -x \ - && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdesktop-1.9.0-6.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/rdesktop.spec -e "s|%{_rpmconfigdir}/%{_real_vendor}|/usr/share/libtool/config|" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdesktop.spec --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm RUN set -x \ @@ -34,9 +36,9 @@ RUN set -x \ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm -#RUN set -x \ -# && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --define "mkrel %nil" --nodeps \ -# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm +RUN set -x \ + && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/yaz-5.34.2-1.mga10.src.rpm --define "mkrel %nil" --nodeps \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ @@ -63,3 +65,9 @@ RUN set -x \ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec --define "mkrel %nil" \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm + +RUN set -x \ + && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/wireless-tools-30-0.pre9.14.mga9.src.rpm \ + && sed -i ${HOME}/rpmbuild/SPECS/wireless-tools.spec -e "s/%patch/%patch -P /" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/wireless-tools.spec --define "mkrel %nil" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/lib64iw{30,-devel}-30*.rpm diff --git a/redhat/docker/omvcooker/packages b/redhat/docker/omvcooker/packages index 47a126218..87fc9fd5f 100644 --- a/redhat/docker/omvcooker/packages +++ b/redhat/docker/omvcooker/packages @@ -166,6 +166,7 @@ lib64tirpc-devel lib64twolame-devel lib64udev-devel lib64udisks-devel +lib64unibreak-devel lib64usb-compat0.1-devel lib64usb1.0-devel lib64utempter0 @@ -187,6 +188,9 @@ lib64xxf86dga-devel lib64xxf86vm-devel lib64wrap-devel librsvg +libwebp-devel +libxt-devel +libxv-devel lm_sensors-devel mysql-devel nas-devel @@ -217,7 +221,9 @@ perl(Tk) perl(XML::Parser) pilot-link-devel pinentry-gtk2 +pkgconfig(ao) pkgconfig(audiofile) +pkgconfig(libgssglue) pkgconfig(libpng16) postgresql postgresql-devel diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh index 5d4dce450..292ae9983 100755 --- a/redhat/docker/opensuse32.sh +++ b/redhat/docker/opensuse32.sh @@ -17,6 +17,8 @@ fi IMAGE="${NAME}:latest" INSTALLROOT="/dev/shm/${IMAGE}" +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip + for dir in dev proc sys; do if [ -d "${INSTALLROOT}/${dir}" ]; then umount "${INSTALLROOT}/${dir}" @@ -81,6 +83,6 @@ rm -rf "${INSTALLROOT}" docker rmi -f "${IMAGE}" docker import "${FILE}" "${IMAGE}" -pigz "${FILE}" +${GZIP} "${FILE}" mkdir -p "/home/${SUDO_USER}/tde/docker" mv -fv "${FILE}.gz" "/home/${SUDO_USER}/tde/docker" diff --git a/redhat/docker/oss156/packages b/redhat/docker/oss156/packages index 8d7c5f71f..be5009ec0 100644 --- a/redhat/docker/oss156/packages +++ b/redhat/docker/oss156/packages @@ -137,9 +137,11 @@ libtwolame-devel libudev1 libudisks2-0-devel libuuid-devel +libunibreak-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 19aa7b6f4..b54fcea1f 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.5.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.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 \ + && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" 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.5.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.2.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 50ac34c5b..b8c5328a1 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -26,10 +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.5.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-4.1.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 \ + && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" 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/packages b/redhat/docker/osstw/packages index 7032cacde..3bf063281 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -137,10 +137,12 @@ libtool libtwolame-devel libudev-devel libudisks2-0-devel +libunibreak-devel libuuid-devel libv4l-devel libvisual-devel libvorbis-devel +libwebp-devel libwmf-devel libwpd-devel libXaw-devel diff --git a/redhat/docker/pclinuxos.sh b/redhat/docker/pclinuxos.sh index 42ab539cc..c4efb8f12 100755 --- a/redhat/docker/pclinuxos.sh +++ b/redhat/docker/pclinuxos.sh @@ -4,6 +4,7 @@ NAME="pclinuxos" VERSION="${1:-2024}" # E.g: '2020' IMAGE="${NAME}:${VERSION}" INSTALLROOT="/dev/shm/${IMAGE}" +[ -x /usr/bin/pigz ] && GZIP=pigz || GZIP=gzip grep -qw "${INSTALLROOT}/dev" /proc/mounts && sudo umount "${INSTALLROOT}/dev" sudo rm -rf "${INSTALLROOT}" @@ -50,4 +51,4 @@ sudo tar -C "${INSTALLROOT}" -c . | docker import - "${IMAGE}" docker run -ti --rm "${IMAGE}" ls -l sudo rm -rf "${INSTALLROOT}" -docker image save "${IMAGE}" | pigz -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz" +docker image save "${IMAGE}" | ${GZIP} -9 >"${HOME}/tde/docker/${IMAGE}.tar.gz" diff --git a/redhat/docker/pclinuxos/Dockerfile.x86_64 b/redhat/docker/pclinuxos/Dockerfile.x86_64 index 1d92b8a8a..ae7a5ab45 100644 --- a/redhat/docker/pclinuxos/Dockerfile.x86_64 +++ b/redhat/docker/pclinuxos/Dockerfile.x86_64 @@ -56,7 +56,7 @@ RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPM && rpmbuild -ba ${HOME}/rpmbuild/SPECS/html2ps.spec \ && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/html2ps-2*.rpm -RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/8/SRPMS/core/updates/heimdal-7.7.1-1.3.mga8.src.rpm \ +RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/heimdal-7.8.0-2.mga9.src.rpm \ && sed -i ${HOME}/rpmbuild/SPECS/heimdal.spec -e "s|%autopatch|%patch1|" -e "/Conflicts: krb5-devel/ s|^|#|" \ - && rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ - && echo sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm + && LDFLAGS="-lcrypt -Wl,--allow-shlib-undefined" rpmbuild -ba ${HOME}/rpmbuild/SPECS/heimdal.spec \ + && sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/heimdal-{devel,libs}-7*.rpm diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64 index d34407ee8..e0e5fb2ba 100644 --- a/redhat/docker/pclinuxos/packages.x86_64 +++ b/redhat/docker/pclinuxos/packages.x86_64 @@ -33,6 +33,7 @@ fribidi-devel gamin-devel gcc-c++ gettext-devel +ghostscript glib2-devel gnokii-devel gnutls-devel @@ -70,18 +71,23 @@ lib64iw29-devel lib64jack-devel lib64nm-devel lib64mpcdec-devel +lib64nas-devel +lib64npth-devel lib64OpenSP5-devel lib64pcsclite-devel lib64pkcs11-helper-devel lib64polkit1-devel lib64poppler-devel lib64readline-devel +lib64rsvg2-devel lib64sane1-devel lib64sndfile-devel lib64ssh-devel +lib64udev1-devel lib64unwind-devel lib64usb1.0-devel lib64usb-compat0.1-devel +lib64webp-devel lib64wv2-devel lib64xaw-devel lib64xine1.2-devel @@ -159,6 +165,7 @@ mysql-devel nas-devel neon-devel net-snmp-devel +netpbm ocaml OpenEXR-devel openldap-devel diff --git a/redhat/docker/pclinuxos/rpmmacros b/redhat/docker/pclinuxos/rpmmacros index 5c9fcc2e4..00b98f240 100644 --- a/redhat/docker/pclinuxos/rpmmacros +++ b/redhat/docker/pclinuxos/rpmmacros @@ -1,7 +1,10 @@ -%dist .pclos +%dist .pclos2024 %_smp_mflags -j8 %jobs 8 -%pclinuxos 2022 +%pclinuxos 2024 %configure %configure2_5x %python python3 %__python /usr/bin/python3 +%_vpath_builddir . +%python_sitearch %python3_sitearch +%python_sitelib %python3_sitelib |