JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Drop aarch64 host toolchain dependencies

Browse Source
This commit is contained in:
zador-blood-stained
2017-08-20 22:03:28 +03:00
parent 595cae9141
commit ced43bf527
7 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@@ -5,10 +5,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade &&
pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate gawk gcc-arm-linux-gnueabihf \ 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 \ 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 \ 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-arm64-cross \ ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross \
curl gcc-arm-none-eabi libnewlib-arm-none-eabi patchutils python liblz4-tool libpython2.7-dev linux-base swig libpython-dev \ curl 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 \ systemd-container udev distcc gcc-4.9-arm-linux-gnueabihf \
g++-4.9-arm-linux-gnueabihf g++-4.9-aarch64-linux-gnu g++-5-aarch64-linux-gnu g++-5-arm-linux-gnueabihf lib32stdc++6 \ g++-4.9-arm-linux-gnueabihf g++-5-arm-linux-gnueabihf lib32stdc++6 \
libc6-i386 lib32ncurses5 lib32tinfo5 locales ncurses-base zlib1g:i386 aptly pixz libc6-i386 lib32ncurses5 lib32tinfo5 locales ncurses-base zlib1g:i386 aptly pixz
RUN locale-gen en_US.UTF-8 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 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' TERM=screen

7
config/sources/meson64.conf
View File

@@ -2,6 +2,8 @@ BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
BOOTDIR=$MAINLINE_UBOOT_DIR BOOTDIR=$MAINLINE_UBOOT_DIR
BOOTBRANCH=$MAINLINE_UBOOT_BRANCH BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
UBOOT_USE_GCC='> 7.0'
case $BOARD in case $BOARD in
nanopik2) nanopik2)
BOOTSCRIPT="boot-meson64.cmd:boot.cmd" BOOTSCRIPT="boot-meson64.cmd:boot.cmd"
@@ -25,11 +27,16 @@ case $BRANCH in
KERNELSOURCE='https://github.com/150balbes/Amlogic_s905-kernel' KERNELSOURCE='https://github.com/150balbes/Amlogic_s905-kernel'
KERNELBRANCH='branch:armbian' KERNELBRANCH='branch:armbian'
KERNELDIR='linux-meson64' KERNELDIR='linux-meson64'
KERNEL_USE_GCC='> 7.0'
;; ;;
dev) dev)
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH='branch:master' KERNELBRANCH='branch:master'
KERNELDIR=$MAINLINE_KERNEL_DIR KERNELDIR=$MAINLINE_KERNEL_DIR
KERNEL_USE_GCC='> 7.0'
;; ;;
esac esac

11
config/sources/mvebu64.conf
View File

@@ -1,5 +1,5 @@
ARCH=arm64 ARCH=arm64
KERNEL_IMAGE_TYPE='Image' KERNEL_IMAGE_TYPE=Image
HAS_UUID_SUPPORT=yes HAS_UUID_SUPPORT=yes
#OFFSET=2 #OFFSET=2
@@ -9,7 +9,6 @@ BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
BOOTDIR=$MAINLINE_UBOOT_DIR BOOTDIR=$MAINLINE_UBOOT_DIR
BOOTBRANCH=$MAINLINE_UBOOT_BRANCH BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
BOOTENV_FILE='clearfog-default.txt' BOOTENV_FILE='clearfog-default.txt'
HAS_UUID_SUPPORT=yes HAS_UUID_SUPPORT=yes
@@ -18,13 +17,16 @@ case $BRANCH in
KERNELSOURCE='https://github.com/MarvellEmbeddedProcessors/linux-marvell.git' KERNELSOURCE='https://github.com/MarvellEmbeddedProcessors/linux-marvell.git'
KERNELBRANCH='branch:linux-4.4.52-armada-17.08' KERNELBRANCH='branch:linux-4.4.52-armada-17.08'
KERNELDIR='linux-marvell' KERNELDIR='linux-marvell'
KERNEL_IMAGE_TYPE='Image'
KERNEL_USE_GCC='> 6.0'
;; ;;
next) next)
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH=$MAINLINE_KERNEL_BRANCH KERNELBRANCH=$MAINLINE_KERNEL_BRANCH
KERNELDIR=$MAINLINE_KERNEL_DIR KERNELDIR=$MAINLINE_KERNEL_DIR
KERNEL_USE_GCC='> 7.0'
;; ;;
dev) dev)
@@ -32,7 +34,7 @@ case $BRANCH in
KERNELBRANCH='branch:master' KERNELBRANCH='branch:master'
KERNELDIR='linux-marvell' KERNELDIR='linux-marvell'
KERNEL_USE_GCC='> 6.1' KERNEL_USE_GCC='> 7.0'
;; ;;
esac esac
@@ -40,7 +42,6 @@ CPUMIN=250000
CPUMAX=800000 CPUMAX=800000
GOVERNOR=ondemand GOVERNOR=ondemand
write_uboot_platform() write_uboot_platform()
{ {
# dd if=$1/u-boot.mmc of=$2 bs=512 seek=1 status=noxfer > /dev/null 2>&1 # dd if=$1/u-boot.mmc of=$2 bs=512 seek=1 status=noxfer > /dev/null 2>&1

11
config/sources/odroidc2.conf
View File

@@ -1,7 +1,6 @@
BOOTSOURCE='https://github.com/hardkernel/u-boot.git' BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
BOOTBRANCH='branch:odroidc2-v2015.01' BOOTBRANCH='branch:odroidc2-v2015.01'
BOOTDIR='u-boot-odroidc2' BOOTDIR='u-boot-odroidc2'
UBOOT_USE_GCC='< 5.0'
BOOTSCRIPT="boot-odroid-c2.ini:boot.ini" BOOTSCRIPT="boot-odroid-c2.ini:boot.ini"
UBOOT_TARGET_MAP='ARCH=arm;;sd_fuse/bl1.bin.hardkernel sd_fuse/u-boot.bin' UBOOT_TARGET_MAP='ARCH=arm;;sd_fuse/bl1.bin.hardkernel sd_fuse/u-boot.bin'
@@ -11,6 +10,8 @@ HAS_UUID_SUPPORT=yes
# NOTE: This u-boot version incorrectly parses boot.scr header # NOTE: This u-boot version incorrectly parses boot.scr header
# due to wrong data type for 64 bit compiler, so boot.scr doesn't work # due to wrong data type for 64 bit compiler, so boot.scr doesn't work
UBOOT_USE_GCC='== 4.9'
ARCH=arm64 ARCH=arm64
KERNEL_IMAGE_TYPE=Image KERNEL_IMAGE_TYPE=Image
@@ -19,16 +20,24 @@ case $BRANCH in
KERNELSOURCE='https://github.com/hardkernel/linux' KERNELSOURCE='https://github.com/hardkernel/linux'
KERNELBRANCH='branch:odroidc2-3.14.y' KERNELBRANCH='branch:odroidc2-3.14.y'
KERNELDIR='linux-odroidc2' KERNELDIR='linux-odroidc2'
KERNEL_USE_GCC='> 5.0'
;; ;;
next) next)
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH='branch:linux-4.12.y' KERNELBRANCH='branch:linux-4.12.y'
KERNELDIR=$MAINLINE_KERNEL_DIR KERNELDIR=$MAINLINE_KERNEL_DIR
KERNEL_USE_GCC='> 7.0'
;; ;;
dev) dev)
KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCE=$MAINLINE_KERNEL_SOURCE
KERNELBRANCH='branch:master' KERNELBRANCH='branch:master'
KERNELDIR=$MAINLINE_KERNEL_DIR KERNELDIR=$MAINLINE_KERNEL_DIR
KERNEL_USE_GCC='> 7.0'
;; ;;
esac esac

1
config/sources/s5p6818.conf
View File

@@ -4,7 +4,6 @@ BOOTDIR='u-boot-s5p6818'
BOOTSCRIPT='boot-s5p6818.cmd:boot.cmd' BOOTSCRIPT='boot-s5p6818.cmd:boot.cmd'
BOOTENV_FILE='s5p6818-default.txt' BOOTENV_FILE='s5p6818-default.txt'
UBOOT_TARGET_MAP=";;boot.img" UBOOT_TARGET_MAP=";;boot.img"
UBOOT_USE_GCC='> 6.0' UBOOT_USE_GCC='> 6.0'

1
config/sources/sun50iw1.conf
View File

@@ -34,6 +34,7 @@ case $BRANCH in
KERNELSOURCE='https://github.com/ayufan-pine64/linux-pine64' KERNELSOURCE='https://github.com/ayufan-pine64/linux-pine64'
KERNELBRANCH='branch:my-hacks-1.2' KERNELBRANCH='branch:my-hacks-1.2'
KERNELDIR='linux-pine64' KERNELDIR='linux-pine64'
KERNEL_USE_GCC='> 5.0'
GOVERNOR=interactive GOVERNOR=interactive
INITRD_ARCH=arm INITRD_ARCH=arm

8
lib/general.sh
View File

@@ -463,8 +463,8 @@ prepare_host()
local hostdeps="wget ca-certificates device-tree-compiler pv bc lzop zip binfmt-support build-essential ccache debootstrap ntpdate \ local hostdeps="wget ca-certificates device-tree-compiler 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 \ 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 \ 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 \ nfs-kernel-server btrfs-tools 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 \ curl patchutils python liblz4-tool libpython2.7-dev linux-base swig libpython-dev \
locales ncurses-base pixz" locales ncurses-base pixz"
local codename=$(lsb_release -sc) local codename=$(lsb_release -sc)
@@ -474,8 +474,8 @@ prepare_host()
fi fi
if [[ $codename == xenial ]]; then if [[ $codename == xenial ]]; then
hostdeps="$hostdeps systemd-container udev distcc libstdc++-arm-none-eabi-newlib gcc-4.9-arm-linux-gnueabihf \ hostdeps="$hostdeps systemd-container udev distcc 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++-4.9-arm-linux-gnueabihf \
g++-5-arm-linux-gnueabihf lib32stdc++6 libc6-i386 lib32ncurses5 lib32tinfo5 aptly" g++-5-arm-linux-gnueabihf lib32stdc++6 libc6-i386 lib32ncurses5 lib32tinfo5 aptly"
grep -q i386 <(dpkg --print-foreign-architectures) || dpkg --add-architecture i386 grep -q i386 <(dpkg --print-foreign-architectures) || dpkg --add-architecture i386
if systemd-detect-virt -q -c; then if systemd-detect-virt -q -c; then