Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh b/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh
index cf784a66a..3939b4b7c 100755
--- a/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh
+++ b/src/ci/docker/host-x86_64/dist-various-2/build-solaris-toolchain.sh
@@ -32,24 +32,22 @@ cd solaris
 
 dpkg --add-architecture $APT_ARCH
 apt-get update
-apt-get download $(apt-cache depends --recurse --no-replaces \
+apt-get install -y --download-only                           \
   libc:$APT_ARCH                                             \
-  liblgrp-dev:$APT_ARCH                                      \
   liblgrp:$APT_ARCH                                          \
   libm-dev:$APT_ARCH                                         \
   libpthread:$APT_ARCH                                       \
   libresolv:$APT_ARCH                                        \
   librt:$APT_ARCH                                            \
-  libsendfile-dev:$APT_ARCH                                  \
   libsendfile:$APT_ARCH                                      \
   libsocket:$APT_ARCH                                        \
   system-crt:$APT_ARCH                                       \
-  system-header:$APT_ARCH                                    \
-  | grep "^\w")
+  system-header:$APT_ARCH
 
-for deb in *$APT_ARCH.deb; do
+for deb in /var/cache/apt/archives/*$APT_ARCH.deb; do
   dpkg -x $deb .
 done
+apt-get clean
 
 # The -dev packages are not available from the apt repository we're using.
 # However, those packages are just symlinks from *.so to *.so.<version>.