diff options
| author | François Andriot <[email protected]> | 2024-01-13 14:05:05 +0100 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2024-01-13 14:05:05 +0100 |
| commit | 1ea737d7fb70c48dee90597dd2fb8bb521f55fec (patch) | |
| tree | 9de4d678e52187e517543559a8f212f7f274e817 | |
| parent | e434528aee9c9b1b17c8829f5ac7cbafae2f92b0 (diff) | |
| download | tde-packaging-1ea737d7fb70c48dee90597dd2fb8bb521f55fec.tar.gz tde-packaging-1ea737d7fb70c48dee90597dd2fb8bb521f55fec.zip | |
RPM: osstw: update build scripts
Signed-off-by: François Andriot <[email protected]>
| -rwxr-xr-x | redhat/docker/opensuse32.sh | 2 | ||||
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 6 | ||||
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.x86_64 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/redhat/docker/opensuse32.sh b/redhat/docker/opensuse32.sh index 82d315ed9..5d4dce450 100755 --- a/redhat/docker/opensuse32.sh +++ b/redhat/docker/opensuse32.sh @@ -72,7 +72,7 @@ for dir in dev proc sys; do umount "${INSTALLROOT}/${dir}" done -rm -rfv "${INSTALLROOT}//var/cache/zypp/packages/"* +rm -rfv "${INSTALLROOT}/var/cache/zypp/packages/"* FILE="${IMAGE//\//_}.tar" tar -C "${INSTALLROOT}" -c . >"${FILE}" diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 703d8fb2a..9c445bffe 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -13,7 +13,7 @@ RUN set -x \ && setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages) # Add non-root user to build packages -RUN useradd -m -s /bin/bash -u 1000 trinity \ +RUN /usr/sbin/useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers USER trinity @@ -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.3.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.4.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.2-1.2.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.3-1.1.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 5dad3352a..07873cdb7 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -26,7 +26,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/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.3.src.rpm \ +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/libheimdal-7.8.0-3.4.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 \ |