From 70ee9a9771b623e2912ae26f4cd4f113b0430fdb Mon Sep 17 00:00:00 2001 From: Greg Lin Date: Wed, 14 Aug 2019 17:17:16 -0500 Subject: [PATCH] Build with an older xz on openSUSE 42 For compatibility with SLES 12 SP3+. openSUSE 42.3 uses xz 5.2.2 while SLES 12 SP3+ uses xz 5.0.5. --- builder/Dockerfile.opensuse-42 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/builder/Dockerfile.opensuse-42 b/builder/Dockerfile.opensuse-42 index 60a4f2f..2172122 100644 --- a/builder/Dockerfile.opensuse-42 +++ b/builder/Dockerfile.opensuse-42 @@ -10,6 +10,7 @@ RUN zypper --non-interactive update RUN zypper --non-interactive --gpg-auto-import-keys -n install \ bzip2 \ cairo-devel \ + curl \ fdupes \ gcc \ gcc-c++ \ @@ -58,7 +59,6 @@ RUN zypper --non-interactive --gpg-auto-import-keys -n install \ wget \ xdg-utils \ xorg-x11-devel \ - xz-devel \ zip \ zlib-devel \ && zypper clean @@ -69,6 +69,19 @@ RUN gem install fpm && ln -s /usr/lib64/ruby/gems/2.1.0/gems/fpm-1.11.0/bin/fpm RUN chmod 0777 /opt +# Install an older xz 5.0.5 for compatibility with SLES 12 +ARG XZ_VERSION=5.0.5 +ARG XZ_DOWNLOAD_SHA1=26fec2c1e409f736e77a85e4ab314dc74987def0 +RUN curl -fsSL "https://sourceforge.net/projects/lzmautils/files/xz-{$XZ_VERSION}.tar.gz/download" -o xz.tar.gz \ + && echo "$XZ_DOWNLOAD_SHA1 xz.tar.gz" | sha1sum -c - \ + && CWD=`pwd` && TMP=`mktemp -d` \ + && tar -C $TMP -zxvf xz.tar.gz \ + && cd $TMP/xz* \ + && ./configure \ + && make \ + && make install \ + && cd $CWD && rm -rf $TMP && rm -rf xz.tar.gz + # SUSE 12 doesn't have texi2any, so use makeinfo. ENV MAKEINFO=makeinfo