From 0ef5e2ed6df12c296f597f72abd2bbcf09dcd2d9 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sun, 20 Aug 2017 22:07:08 +0300 Subject: [PATCH] Drop unused gcc 4.9 toolchain dependencies --- Dockerfile | 3 +-- lib/general.sh | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7b7b2006c1..36f164d45a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,8 +7,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade && debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev nfs-kernel-server btrfs-tools \ ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross \ curl patchutils python liblz4-tool libpython2.7-dev linux-base swig libpython-dev \ - systemd-container udev distcc gcc-4.9-arm-linux-gnueabihf \ - g++-4.9-arm-linux-gnueabihf g++-5-arm-linux-gnueabihf lib32stdc++6 \ + systemd-container udev distcc g++-5-arm-linux-gnueabihf lib32stdc++6 \ libc6-i386 lib32ncurses5 lib32tinfo5 locales ncurses-base zlib1g:i386 aptly pixz RUN locale-gen en_US.UTF-8 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' TERM=screen diff --git a/lib/general.sh b/lib/general.sh index f21fcd09a0..b0e08dbf02 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -474,9 +474,8 @@ prepare_host() fi if [[ $codename == xenial ]]; then - hostdeps="$hostdeps systemd-container udev distcc gcc-4.9-arm-linux-gnueabihf \ - g++-4.9-arm-linux-gnueabihf \ - g++-5-arm-linux-gnueabihf lib32stdc++6 libc6-i386 lib32ncurses5 lib32tinfo5 aptly" + hostdeps="$hostdeps systemd-container udev distcc \ + lib32stdc++6 libc6-i386 lib32ncurses5 lib32tinfo5 aptly" grep -q i386 <(dpkg --print-foreign-architectures) || dpkg --add-architecture i386 if systemd-detect-virt -q -c; then display_alert "Running in container" "$(systemd-detect-virt)" "info"