Update README

Update README

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>

.github/workflows/main.yml

@@ -48,7 +48,7 @@ jobs:
       matrix:
         arch_name: [android-arm, android-arm64, android-x86, android-x86_64, 
           linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, 
-          linux-armv6, linux-armv6-lts, linux-armv6-musl, 
+          linux-armv6, linux-armv6-lts, linux-armv6-musl, linux-arm64-full, 
           linux-armv7, linux-armv7a, linux-armv7l-musl, 
           linux-x64-clang, linux-s390x, linux-x64, linux-x86, 
           linux-mips, linux-ppc64le, web-wasm,

Makefile

@@ -14,7 +14,7 @@ BIN = ./bin
 
 # These images are built using the "build implicit rule"
 STANDARD_IMAGES = android-arm android-arm64 android-x86 android-x86_64 \
-	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl \
+	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
 	linux-armv5 linux-armv5-musl linux-m68k-uclibc linux-s390x \
 	linux-armv6 linux-armv6-lts linux-armv6-musl \
 	linux-armv7l-musl linux-armv7 linux-armv7a \
@@ -24,7 +24,7 @@ STANDARD_IMAGES = android-arm android-arm64 android-x86 android-x86_64 \
 
 # Generated Dockerfiles.
 GEN_IMAGES = android-arm android-arm64 \
-	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl \
+	linux-x86 linux-x64 linux-x64-clang linux-arm64 linux-arm64-musl linux-arm64-full \
 	manylinux2014-x64 manylinux2014-x86 \
 	web-wasm linux-mips \
 	windows-static-x86 windows-static-x64 windows-static-x64-posix \
@@ -40,7 +40,7 @@ GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
 NON_STANDARD_IMAGES = manylinux2014-x64 manylinux2014-x86 web-wasm
 
 # Docker composite files
-DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux \
+DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.buildroot \
 	common.crosstool common.windows common-manylinux.crosstool common.dockcross common.label-and-env
 DOCKER_COMPOSITE_FOLDER_PATH = common/
 DOCKER_COMPOSITE_PATH = $(addprefix $(DOCKER_COMPOSITE_FOLDER_PATH),$(DOCKER_COMPOSITE_SOURCES))
@@ -93,6 +93,7 @@ $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOS
 		-e '/common.debian/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.debian' \
 		-e '/common.manylinux/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux' \
 		-e '/common.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.crosstool' \
+		-e '/common.buildroot/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.buildroot' \
 		-e '/common-manylinux.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common-manylinux.crosstool' \
 		-e '/common.windows/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.windows' \
 		-e '/common.dockcross/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.dockcross' \

README.md

@@ -13,13 +13,14 @@ Cross compiling toolchains in Docker images.
 -   Most images also contain an emulator for the target system.
 -   Clean separation of build tools, source code, and build artifacts.
 -   Commands in the container are run as the calling user, so that any created files have the expected ownership, (i.e. not root).
--   Make variables **CC**, **CXX**, **LD** etc) are set to point to the appropriate tools in the container.
+-   Make variables **CC**, **CXX**, **LD**, **AS** etc) are set to point to the appropriate tools in the container.
 -   Recent [CMake](https://cmake.org) and ninja are precompiled.
 -   [Conan.io](https://www.conan.io) can be used as a package manager.
 -   Toolchain files configured for CMake.
 -   Current directory is mounted as the container\'s workdir, `/work`.
 -   Works with the [Docker for Mac](https://docs.docker.com/docker-for-mac/) and [Docker for Windows](https://docs.docker.com/docker-for-windows/).
 -   Support using alternative container executor by setting **OCI_EXE** environment variable. By default, it searches for [docker](https://www.docker.com) and [podman](https://podman.io) executable.
+-   [crosstool-ng](https://github.com/crosstool-ng/crosstool-ng) and [buildroot](https://github.com/buildroot/buildroot) configuration files.
 
 ## Examples
 
@@ -40,26 +41,32 @@ This image does not need to be run manually. Instead, there is a helper script t
 
 To install the helper script, run one of the images with no arguments, and redirect the output to a file:
 
-    docker run --rm CROSS_COMPILER_IMAGE_NAME > ./dockcross
-    chmod +x ./dockcross
-    mv ./dockcross ~/bin/
+```bash
+docker run --rm CROSS_COMPILER_IMAGE_NAME > ./dockcross
+chmod +x ./dockcross
+mv ./dockcross ~/bin/
+```
 
 Where **CROSS_COMPILER_IMAGE_NAME** is the name of the cross-compiler toolchain Docker instance, e.g: **dockcross/linux-armv7**.
 
-Only 64-bit x86_64 images are provided; a 64-bit x86_64 host system is required.
+Only 64-bit x86_64 images are provided, a 64-bit x86_64 host system is required.
 
 ## Usage
 
 For the impatient, here\'s how to compile a hello world for armv7:
 
-    cd ~/src/dockcross
-    docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7
-    chmod +x ./dockcross-linux-armv7
-    ./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm'
+```bash
+cd ~/src/dockcross
+docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7
+chmod +x ./dockcross-linux-armv7
+./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm'
+```
 
 Note how invoking any toolchain command (make, gcc, etc.) is just a matter of prepending the **dockcross** script on the commandline:
 
-    ./dockcross-linux-armv7 [command] [args...]
+```bash
+./dockcross-linux-armv7 [command] [args...]
+```
 
 The dockcross script will execute the given command-line inside the container, along with all arguments passed after the command. Commands that evaluate environmental variables in the image, like **$CC** or **$CXX** above, should be executed in [bash -c]. The present working directory is mounted within the image, which can be used to make source code available in the Docker container.
 
@@ -73,6 +80,7 @@ The dockcross script will execute the given command-line inside the container, a
 | dockcross/android-x86 | x86 | Clang | Android |
 | dockcross/android-x86_64 | x86_64 | Clang | Android |
 | dockcross/linux-arm64 | ARMv8 | GCC | Linux |
+| dockcross/linux-arm64-full | ARMv8 | GCC | Linux |
 | dockcross/linux-arm64-musl | ARMv8 | GCC + musl | Linux |
 | dockcross/linux-armv5 | ARMv5 | GCC | Linux |
 | dockcross/linux-armv5-musl | ARMv5 | GCC + musl | Linux |
@@ -140,6 +148,12 @@ The Android NDK standalone toolchain for the x86_64 architecture.
 
 Cross compiler for the 64-bit ARM platform on Linux, also known as AArch64.
 
+### dockcross/linux-arm64-full
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-arm64-full/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-arm64-full)
+
+Cross compiler for the 64-bit ARM platform on Linux, with cross-libs: SDL2, OpenSSL, Boost, OpenCV and Qt5 (minimal).
+
 ### dockcross/linux-arm64-musl
 
 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-arm64-musl/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-arm64-musl)
@@ -349,12 +363,13 @@ cross-compiler Docker image or the dockcross script itself.
 
 To easily download all images, the convenience target `display_images`
 could be used:
-
-    curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
-    for image in $(make -f dockcross-Makefile display_images); do
-      echo "Pulling dockcross/$image"
-      docker pull dockcross/$image
-    done
+```bash
+curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
+for image in $(make -f dockcross-Makefile display_images); do
+  echo "Pulling dockcross/$image"
+  docker pull dockcross/$image
+done
+```
 
 ## Install all dockcross scripts
 
@@ -362,16 +377,18 @@ To automatically install in `~/bin` the dockcross scripts for each
 images already downloaded, the convenience target `display_images` could
 be used:
 
-    curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
-    for image in $(make -f dockcross-Makefile display_images); do
-      if [[ $(docker images -q dockcross/$image) == "" ]]; then
-        echo "~/bin/dockcross-$image skipping: image not found locally"
-        continue
-      fi
-      echo "~/bin/dockcross-$image ok"
-      docker run dockcross/$image > ~/bin/dockcross-$image && \
-      chmod u+x  ~/bin/dockcross-$image
-    done
+```bash
+curl https://raw.githubusercontent.com/dockcross/dockcross/master/Makefile -o dockcross-Makefile
+for image in $(make -f dockcross-Makefile display_images); do
+  if [[ $(docker images -q dockcross/$image) == "" ]]; then
+    echo "~/bin/dockcross-$image skipping: image not found locally"
+    continue
+  fi
+  echo "~/bin/dockcross-$image ok"
+  docker run dockcross/$image > ~/bin/dockcross-$image && \
+  chmod u+x  ~/bin/dockcross-$image
+done
+```
 
 ## Dockcross configuration
 
@@ -416,17 +433,21 @@ In order to extend Dockcross images with your own commands, one must:
 
 An example Dockerfile would be:
 
-    FROM dockcross/linux-armv7
+```
+FROM dockcross/linux-armv7
 
-    ENV DEFAULT_DOCKCROSS_IMAGE my_cool_image
-    RUN apt-get install nano
+ENV DEFAULT_DOCKCROSS_IMAGE my_cool_image
+RUN apt-get install nano
+```
 
 And then in the shell:
 
-    docker build -t my_cool_image .                   ## Builds the dockcross image.
-    docker run my_cool_image > linux-armv7                ## Creates a helper script named linux-armv7.
-    chmod +x linux-armv7                          ## Gives the script execution permission.
-    ./linux-armv7 bash                            ## Runs the helper script with the argument "bash", which starts an interactive container using your extended image.
+```
+docker build -t my_cool_image .                   ## Builds the dockcross image.
+docker run my_cool_image > linux-armv7                ## Creates a helper script named linux-armv7.
+chmod +x linux-armv7                          ## Gives the script execution permission.
+./linux-armv7 bash                            ## Runs the helper script with the argument "bash", which starts an interactive container using your extended image.
+```
 
 ## What is the difference between **dockcross** and **dockbuild** ?
 

common/common.buildroot

@@ -0,0 +1,30 @@
+
+# Install Debian packages required for `buildroot`.
+RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
+    gawk \
+    gperf \
+    help2man \
+    python3-dev \
+    texinfo \
+    unzip \
+    libtool \
+    libtool-bin \
+    && apt-get clean autoclean --yes \
+    && apt-get autoremove --yes \
+    && rm -rf /var/lib/{apt,dpkg,cache,log}/
+
+COPY \
+  imagefiles/install-buildroot-toolchain.sh \
+  buildroot.config \
+  /dockcross/
+
+# Build and install the toolchain, cleaning up artifacts afterwards.
+RUN mkdir /dockcross/buildroot \
+    && cd /dockcross/buildroot \
+    && /dockcross/install-buildroot-toolchain.sh \
+    -c "/dockcross/buildroot.config" \
+    -v "${BR_VERSION}" \
+    && rm -rf /dockcross/buildroot /dockcross/install-buildroot-toolchain.sh
+
+# Restore our default workdir (from "dockcross/base").
+WORKDIR /work

common/common.crosstool

@@ -48,7 +48,7 @@ RUN mkdir /dockcross/crosstool \
 && cd /dockcross/crosstool \
 && /dockcross/install-crosstool-ng-toolchain.sh \
   -p "${XCC_PREFIX}" \
-  -c /dockcross/crosstool-ng.config \
+  -c "/dockcross/crosstool-ng.config" \
   -v "${CT_VERSION}" \
 && rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh
 

imagefiles/install-buildroot-toolchain.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+set -x
+set -e
+set -o pipefail
+
+ROOT=${PWD}
+
+usage() { echo "Usage: $0 -c <config-path> -v <version>" 1>&2; exit 1; }
+
+REPO_URL="https://github.com/buildroot/buildroot.git"
+
+CONFIG_PATH=""
+REV="2021.08-rc1"
+while getopts "c:v:" o; do
+  case "${o}" in
+  c)
+    CONFIG_PATH=$(readlink -f ${OPTARG})
+    ;;
+  v)
+    REV=${OPTARG}
+    ;;
+  *)
+    usage
+    ;;
+  esac
+done
+shift $((OPTIND-1))
+
+if [ -z ${CONFIG_PATH} ] || [ ! -f ${CONFIG_PATH} ]; then
+  echo "ERROR: Missing config path (-c)."
+  usage
+fi
+
+if [ -z ${REV} ]; then
+  echo "WARNING: No version selected, use default version: $REV (-v)."
+fi
+
+
+git clone "$REPO_URL" --recurse-submodules --remote-submodules #--branch="$REV"
+cd buildroot
+git checkout "$REV"
+cp "$CONFIG_PATH" .config
+make

linux-arm64-full/Dockerfile.in

@@ -0,0 +1,41 @@
+FROM dockcross/base:latest
+
+# This is for 64-bit ARM Linux machine
+
+# Buildroot version
+ENV BR_VERSION 2021.08-rc1
+
+#include "common.buildroot"
+
+# The cross-compiling emulator
+RUN apt-get update \
+&& apt-get install -y \
+  qemu-user \
+  qemu-user-static \
+&& apt-get clean --yes
+
+# The CROSS_TRIPLE is a configured alias of the "aarch64-buildroot-linux-gnu" target.
+ENV CROSS_TRIPLE aarch64-buildroot-linux-gnu
+ENV CROSS_ROOT /buildroot
+ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
+    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
+    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
+    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
+    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
+
+ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
+ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
+
+COPY Toolchain.cmake ${CROSS_ROOT}/
+ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
+
+#ENV PKG_CONFIG_PATH /usr/lib/aarch64-linux-gnu/pkgconfig
+
+# Linux kernel cross compilation variables
+ENV PATH ${PATH}:${CROSS_ROOT}/bin
+ENV CROSS_COMPILE ${CROSS_TRIPLE}-
+ENV ARCH arm64
+
+#include "common.label-and-env"

linux-arm64-full/Toolchain.cmake

@@ -0,0 +1,22 @@
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_VERSION 1)
+set(CMAKE_SYSTEM_PROCESSOR aarch64)
+
+set(cross_triple "aarch64-buildroot-linux-gnu")
+set(cross_root /buildroot)
+
+set(CMAKE_C_COMPILER $ENV{CC})
+set(CMAKE_CXX_COMPILER $ENV{CXX})
+set(CMAKE_Fortran_COMPILER $ENV{FC})
+
+set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")
+
+set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)
+
+set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-aarch64)

tools/dockcross-make-builder.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+if (( $# >= 1 )); then
+    image=$1
+    build_file=build-${image%:*}
+    shift 1
+
+    make_arg=$*
+    echo "make arg: $make_arg"
+
+    #echo "Pulling dockcross/$image"
+    #docker pull dockcross/"$image"
+
+    echo "Make script dockcross-$image"
+    docker run --rm dockcross/"$image" > ./dockcross-"$image"
+    chmod +x ./dockcross-"$image"
+
+    echo "Build $build_file"
+    ./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
+else
+    echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
+    exit 1
+fi