From 595cae9141ea200c3c9ed106a110e4b404ffb832 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sun, 20 Aug 2017 21:13:01 +0300 Subject: [PATCH] Drop the soft float host toolchain dependency --- Dockerfile | 4 ++-- config/sources/mvebu.conf | 2 +- config/sources/rda8810.conf | 2 +- lib/general.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index b6e0cf3a0e..c90a386c15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,10 @@ FROM ubuntu:16.04 RUN dpkg --add-architecture i386 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade && \ DEBIAN_FRONTEND=noninteractive apt-get install -y git dialog lsb-release binutils wget ca-certificates device-tree-compiler \ - pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate gawk gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi \ + pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate gawk gcc-arm-linux-gnueabihf \ qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev ntpdate parted pkg-config libncurses5-dev whiptail \ debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev nfs-kernel-server btrfs-tools \ - gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross libc6-dev-armel-cross libc6-dev-arm64-cross \ + gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross libc6-dev-arm64-cross \ curl gcc-arm-none-eabi libnewlib-arm-none-eabi patchutils python liblz4-tool libpython2.7-dev linux-base swig libpython-dev \ systemd-container udev distcc libstdc++-arm-none-eabi-newlib gcc-4.9-arm-linux-gnueabihf gcc-4.9-aarch64-linux-gnu \ g++-4.9-arm-linux-gnueabihf g++-4.9-aarch64-linux-gnu g++-5-aarch64-linux-gnu g++-5-arm-linux-gnueabihf lib32stdc++6 \ diff --git a/config/sources/mvebu.conf b/config/sources/mvebu.conf index 51adb16f2b..6aded8d72a 100644 --- a/config/sources/mvebu.conf +++ b/config/sources/mvebu.conf @@ -7,7 +7,7 @@ UBOOT_TARGET_MAP="u-boot.mmc;;u-boot.mmc u-boot-uart.mmc u-boot.sata;sata;u-boot.sata u-boot-uart.sata u-boot.flash;spi;u-boot.flash u-boot-uart.flash" -UBOOT_USE_GCC='< 5.0' +UBOOT_USE_GCC='== 4.9' UBOOT_COMPILER='arm-linux-gnueabi-' BOOTENV_FILE='clearfog-default.txt' diff --git a/config/sources/rda8810.conf b/config/sources/rda8810.conf index 6f102f3be8..d27d661918 100644 --- a/config/sources/rda8810.conf +++ b/config/sources/rda8810.conf @@ -9,7 +9,7 @@ OFFSET=2 UBOOT_TARGET_MAP=';;u-boot.rda' -UBOOT_USE_GCC='< 5.0' +UBOOT_USE_GCC='== 4.9' UBOOT_COMPILER='arm-linux-gnueabi-' KERNELSOURCE='https://github.com/RDA8810/linux-RDA8810' diff --git a/lib/general.sh b/lib/general.sh index 213f63a45a..0ba145b672 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -461,9 +461,9 @@ prepare_host() # packages list for host # NOTE: please sync any changes here with the Dockerfile and Vagrantfile local hostdeps="wget ca-certificates device-tree-compiler pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate \ - gawk gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev \ + gawk gcc-arm-linux-gnueabihf qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev \ parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev \ - nfs-kernel-server btrfs-tools gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross libc6-dev-armel-cross \ + nfs-kernel-server btrfs-tools gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross \ libc6-dev-arm64-cross curl gcc-arm-none-eabi libnewlib-arm-none-eabi patchutils python liblz4-tool libpython2.7-dev linux-base swig libpython-dev \ locales ncurses-base pixz"