enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop unused gcc 4.9 toolchain dependencies

Browse Source
This commit is contained in:
zador-blood-stained 2017-08-20 22:07:08 +03:00
parent ced43bf527
commit 0ef5e2ed6d
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -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

5
lib/general.sh
View File

@ -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"