diff options
Diffstat (limited to 'redhat/docker/osstw/Dockerfile.i686')
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index b54fcea1f..59a9bcf9a 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.2 +ARG TDE_VERSION=14.1.3 ARG ARCH=i686 # Add PACKMAN repository @@ -13,27 +13,37 @@ RUN set -x \ && setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages) # Add non-root user to build packages -RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ +RUN set -x \ + && /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers USER trinity COPY rpmmacros /home/trinity/.rpmmacros +# Fix taglib headers to match actual built library (amarok, soundkonverter) +RUN set -x \ + && sed -i "/usr/include/taglib/id3v1tag.h" -e "s|offset_t tagOffset|long tagOffset|" \ + && sed -i "/usr/include/taglib/tfile.h" -e "s|offset_t offset|long offset|" -e "s|offset_t start|long start|" + # Add YUM repository for locally built packages -RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ +RUN set -x \ + && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && 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-4.1.src.rpm \ +COPY heimdal-7.8.0-ftbfs_osstw_i686.patch /home/trinity/rpmbuild/SOURCES +RUN set -x \ + && 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|^|#|" \ + && sed -i "${HOME}/rpmbuild/SPECS/libheimdal.spec" -e "/^Source0:/ s|.*|Source0: heimdal-7.8.0.tar.gz|" -e "/^Patch0/ s|.*|Patch0: heimdal-7.8.0-ftbfs_osstw_i686.patch|" \ && 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.4-1.2.src.rpm \ +RUN set -x \ + && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.3.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" |