Change 4 jobs build to automatic jobs build on linux-armv7a

Change 4 jobs build to automatic jobs build on linux-armv7a

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

Dockerfile.in

@@ -1,4 +1,4 @@
-FROM debian:stretch-20190326-slim
+FROM debian:buster-slim
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 #include "common.debian"

Makefile

@@ -330,7 +330,7 @@ clean:
 .SECONDEXPANSION:
 $(addsuffix .test,$(STANDARD_IMAGES)): $$(basename $$@)
 	$(DOCKER) run $(RM) $(ORG)/$(basename $@) > $(BIN)/dockcross-$(basename $@) && chmod +x $(BIN)/dockcross-$(basename $@)
-	$(BIN)/dockcross-$(basename $@) python test/run.py $($@_ARGS)
+	$(BIN)/dockcross-$(basename $@) python3 test/run.py $($@_ARGS)
 
 #
 # testing prerequisites implicit rule

common-manylinux.crosstool

@@ -48,6 +48,7 @@ ENV XCC_PREFIX=/usr/xcc
 COPY \
   imagefiles/install-crosstool-ng-toolchain.sh \
   imagefiles/crosstool-ng-expat.patch \
+  imagefiles/Fix-error-with-bash-5-and-up.patch \
   manylinux2014-aarch64/crosstool-ng.config \
   /dockcross/
 

common.crosstool

@@ -16,12 +16,14 @@
 
 # Install Debian packages required for `ct-ng`.
 RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
-  gawk \
+    gawk \
-  gperf \
+    gperf \
-  help2man \
+    help2man \
-  python-dev \
+    python3-dev \
-  texinfo \
+    texinfo \
-&& apt-get clean --yes
+    && apt-get clean autoclean --yes \
+    && apt-get autoremove --yes \
+    && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 ENV XCC_PREFIX=/usr/xcc
 
@@ -33,6 +35,7 @@ ENV XCC_PREFIX=/usr/xcc
 COPY \
   imagefiles/install-crosstool-ng-toolchain.sh \
   imagefiles/crosstool-ng-expat.patch \
+  imagefiles/Fix-error-with-bash-5-and-up.patch \
   crosstool-ng.config \
   /dockcross/
 
@@ -42,6 +45,7 @@ RUN mkdir /dockcross/crosstool \
 && /dockcross/install-crosstool-ng-toolchain.sh \
   -p "${XCC_PREFIX}" \
   -c /dockcross/crosstool-ng.config \
+  -v "${CT_VERSION}" \
 && rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh
 
 # Restore our default workdir (from "dockcross/base").

common.debian

@@ -1,11 +1,6 @@
 ARG DEBIAN_FRONTEND=noninteractive
-ARG REPO=http://cdn-fastly.deb.debian.org
 
 RUN \
-  bash -c "echo \"deb $REPO/debian stretch main contrib non-free\" > /etc/apt/sources.list"  && \
-  bash -c "echo \"deb $REPO/debian stretch-updates main contrib non-free\" >> /etc/apt/sources.list"  && \
-  bash -c "echo \"deb $REPO/debian-security stretch/updates main\" >> /etc/apt/sources.list" && \
-  bash -c "echo \"deb http://ftp.debian.org/debian stretch-backports main\" >> /etc/apt/sources.list" && \
   apt-get update --yes && \
   apt-get install --no-install-recommends --yes \
     autogen \
@@ -30,8 +25,8 @@ RUN \
     ncurses-dev \
     pkg-config \
     pax \
-#    python3 \
+    python3 \
-#    python3-pip \
+    python3-pip \
     rsync \
     sed \
     ssh \
@@ -41,23 +36,10 @@ RUN \
     xz-utils \
     zip \
     zlib1g-dev \
-# python build
+#    python-is-python3 \
-    libncurses5-dev \
+    && apt-get clean autoclean --yes \
-    libgdbm-dev \
+    && apt-get autoremove --yes \
-    libnss3-dev \
+    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-    libssl-dev \
-    libsqlite3-dev \
-    libreadline-dev \
-    libffi-dev \
-    libbz2-dev\
-  && \
-  apt-get clean --yes
 
-# build and install python
+RUN ln -s /usr/bin/python3 /usr/bin/python \
-COPY \
+    && ln -s /usr/bin/pip3 /usr/bin/pip
-  imagefiles/build-and-install-python.sh \
-  /buildscripts/
-RUN \
-  set -x && \
-  /buildscripts/build-and-install-python.sh && \
-  rm -rf /buildscripts

common.docker

@@ -25,7 +25,7 @@ RUN \
   /buildscripts/build-and-install-git.sh && \
   /buildscripts/install-cmake-binary.sh $X86_FLAG && \
   /buildscripts/install-liquidprompt-binary.sh && \
-  PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python") && \
+  PYTHON=$([ -e /opt/python/cp38-cp38/bin/python ] && echo "/opt/python/cp38-cp38/bin/python" || echo "python3") && \
   /buildscripts/install-python-packages.sh -python ${PYTHON} && \
   /buildscripts/build-and-install-ninja.sh -python ${PYTHON} && \
   rm -rf /buildscripts

imagefiles/Fix-error-with-bash-5-and-up.patch

@@ -0,0 +1,28 @@
+From 67368ebe9d9259e9f34a4f9166a33357858813f1 Mon Sep 17 00:00:00 2001
+From: Bensuperpc <bensuperpc@gmail.com>
+Date: Thu, 24 Jun 2021 11:55:48 +0200
+Subject: [PATCH 1/1] Fix error with bash 5 and up
+
+Fix error with bash 5 and up
+
+Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index d10bf71d..e2302b4c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -274,7 +274,7 @@ ACX_PROG_VERSION_REQ_STRICT([BASH_SHELL],
+     [GNU bash >= 3.1],
+     [bash],
+     [bash],
+-    ['^GNU bash, version (3\.[1-9]|4)'])
++    ['^GNU bash, version (3\.[1-9]|4|5)'])
+ 
+ # We need a awk that *is* GNU awk
+ ACX_PROG_VERSION_REQ_STRICT([AWK],
+-- 
+2.32.0
+

imagefiles/build-and-install-python.sh

@@ -6,6 +6,8 @@
 # Usage:
 #
 #  build-and-install-python.sh [-version 3.9.5]
+# needed packages : libncurses5-dev libgdbm-dev libnss3-dev 
+#   libssl-dev libsqlite3-dev libreadline-dev libffi-dev libbz2-dev
 
 PYTHON_VERSION=3.9.5
 while [ $# -gt 0 ]; do

imagefiles/install-crosstool-ng-toolchain.sh

@@ -16,7 +16,7 @@ set -o pipefail
 # be generated underneath of here.
 ROOT=${PWD}
 
-usage() { echo "Usage: $0 -p <prefix> -c <config-path>" 1>&2; exit 1; }
+usage() { echo "Usage: $0 -p <prefix> -c <config-path> -v <version>" 1>&2; exit 1; }
 
 # Resolve our input parameters.
 #
@@ -24,7 +24,8 @@ usage() { echo "Usage: $0 -p <prefix> -c <config-path>" 1>&2; exit 1; }
 # change directories during installation.
 CT_PREFIX=
 CONFIG_PATH=
-while getopts "p:c:" o; do
+REV=
+while getopts "p:c:v:" o; do
   case "${o}" in
   p)
     CT_PREFIX=$(readlink -f ${OPTARG})
@@ -32,6 +33,9 @@ while getopts "p:c:" o; do
   c)
     CONFIG_PATH=$(readlink -f ${OPTARG})
     ;;
+  v)
+    REV=${OPTARG}
+    ;;
   *)
     usage
     ;;
@@ -48,6 +52,12 @@ if [ -z ${CONFIG_PATH} ] || [ ! -f ${CONFIG_PATH} ]; then
   usage
 fi
 
+if [ -z ${REV} ]; then
+  echo "WARNING: No version selected, use default version: crosstool-ng-1.23.0 (-v)."
+  REV=crosstool-ng-1.23.0
+fi
+
+
 ##
 # Build "crosstool-ng".
 ##
@@ -57,12 +67,19 @@ mkdir -p "${CTNG}"
 cd "${CTNG}"
 
 # Download and install the "crosstool-ng" source.
-REV=1.23.0
+
-curl -# -LO \
+git clone https://github.com/crosstool-ng/crosstool-ng.git
-  "https://github.com/crosstool-ng/crosstool-ng/archive/crosstool-ng-${REV}.tar.gz"
+cd crosstool-ng
-tar -xf "crosstool-ng-${REV}.tar.gz"
+git fetch --tags
-patch crosstool-ng-crosstool-ng-1.23.0/scripts/build/companion_libs/210-expat.sh -i /dockcross/crosstool-ng-expat.patch
+
-cd "crosstool-ng-crosstool-ng-${REV}"
+# checkout 
+git checkout ${REV}
+
+if [ ${REV} = "crosstool-ng-1.23.0" ]; then
+  patch scripts/build/companion_libs/210-expat.sh -i /dockcross/crosstool-ng-expat.patch
+  # Patch to fix error with bash 5 and up: https://github.com/pfalcon/esp-open-sdk/issues/365
+  patch configure.ac -i /dockcross/Fix-error-with-bash-5-and-up.patch
+fi
 
 # Bootstrap and install the tool.
 BOOTSTRAP_PREFIX="${CTNG}/prefix"
@@ -96,5 +113,6 @@ cp "${CONFIG_PATH}" "${BUILD}/.config"
 unset LD_LIBRARY_PATH
 
 # Build and install the toolchain!
-"${BOOTSTRAP_PREFIX}/bin/ct-ng" build
+# Print last 250 lines if build fail
+"${BOOTSTRAP_PREFIX}/bin/ct-ng" build || (tail -250 build.log && exit 1)
 

linux-arm64/Dockerfile.in

@@ -2,6 +2,9 @@ FROM dockcross/base:latest
 
 # This is for 64-bit ARM Linux machine
 
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"
 
 # The cross-compiling emulator

linux-armv5/Dockerfile.in

@@ -4,6 +4,9 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
 # VFP instructions (armhf).
 
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"
 
 # The cross-compiling emulator

linux-armv7/Dockerfile.in

@@ -1,6 +1,9 @@
 FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 # This is for 32-bit ARMv7 Linux
 #include "common.crosstool"
 

linux-armv7a/Dockerfile.in

@@ -2,6 +2,10 @@ FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # This is for 32-bit ARMv7 Linux
+
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"
 
 # The cross-compiling emulator

linux-armv7a/crosstool-ng.config

@@ -11,9 +11,7 @@ CT_CONFIGURE_has_libtool_2_4_or_newer=y
 CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
 CT_CONFIGURE_has_autoconf_2_63_or_newer=y
 CT_CONFIGURE_has_autoreconf_2_63_or_newer=y
-CT_CONFIGURE_has_automake_1_15_or_newer=y
 CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
-CT_CONFIGURE_has_svn=y
 CT_CONFIGURE_has_git=y
 CT_MODULES=y
 
@@ -235,14 +233,14 @@ CT_TOOLCHAIN_ENABLE_NLS=y
 #
 CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 CT_KERNEL="linux"
-CT_KERNEL_VERSION="4.9.36"
+CT_KERNEL_VERSION="4.10.8"
 # CT_KERNEL_bare_metal is not set
 CT_KERNEL_linux=y
 CT_KERNEL_bare_metal_AVAILABLE=y
 CT_KERNEL_linux_AVAILABLE=y
 # CT_KERNEL_LINUX_CUSTOM is not set
-#CT_KERNEL_V_4_10=y
+CT_KERNEL_V_4_10=y
-CT_KERNEL_V_4_9=y
+# CT_KERNEL_V_4_9 is not set
 # CT_KERNEL_V_4_4 is not set
 # CT_KERNEL_V_4_1 is not set
 # CT_KERNEL_V_3_16 is not set
@@ -316,17 +314,15 @@ CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
 # C-library
 #
 CT_LIBC="glibc"
-CT_LIBC_VERSION="2.24"
+CT_LIBC_VERSION="2.27"
 CT_LIBC_glibc=y
-# CT_LIBC_musl is not set
 # CT_LIBC_uClibc is not set
 CT_LIBC_avr_libc_AVAILABLE=y
 CT_LIBC_glibc_AVAILABLE=y
 CT_THREADS="nptl"
-# CT_LIBC_GLIBC_CUSTOM is not set
+CT_CC_GLIBC_SHOW_LINARO=y
-# CT_CC_GLIBC_SHOW_LINARO is not set
+# CT_LIBC_GLIBC_V_2_25 is not set
-#CT_LIBC_GLIBC_V_2_25=y
+# CT_LIBC_GLIBC_V_2_24 is not set
-CT_LIBC_GLIBC_V_2_24=y
 # CT_LIBC_GLIBC_V_2_23 is not set
 CT_LIBC_GLIBC_2_23_or_later=y
 CT_LIBC_GLIBC_2_20_or_later=y
@@ -409,14 +405,10 @@ CT_CC_CORE_PASSES_NEEDED=y
 CT_CC_CORE_PASS_1_NEEDED=y
 CT_CC_CORE_PASS_2_NEEDED=y
 CT_CC_gcc=y
-# CT_CC_GCC_CUSTOM is not set
+CT_CC_GCC_VERSION="7.3.0"
-CT_CC_GCC_VERSION="linaro-6.3-2017.02"
+# CT_CC_GCC_SHOW_LINARO is not set
-CT_CC_GCC_SHOW_LINARO=y
+CT_CC_GCC_V_6_3_0=y
-CT_CC_GCC_V_linaro_6_3=y
-# CT_CC_GCC_V_6_3_0 is not set
-# CT_CC_GCC_V_linaro_5_4 is not set
 # CT_CC_GCC_V_5_4_0 is not set
-# CT_CC_GCC_V_linaro_4_9 is not set
 # CT_CC_GCC_V_4_9_4 is not set
 CT_CC_GCC_4_8_or_later=y
 CT_CC_GCC_4_9_or_later=y
@@ -425,7 +417,6 @@ CT_CC_GCC_6=y
 CT_CC_GCC_6_or_later=y
 CT_CC_GCC_ENABLE_PLUGINS=y
 CT_CC_GCC_GOLD=y
-CT_CC_GCC_HAS_LIBMPX=y
 CT_CC_GCC_ENABLE_CXX_FLAGS=""
 CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
 CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
@@ -478,13 +469,8 @@ CT_CC_SUPPORT_GOLANG=y
 # Additional supported languages:
 #
 CT_CC_LANG_CXX=y
-# CT_CC_LANG_FORTRAN is not set
+CT_CC_LANG_FORTRAN=y
 # CT_CC_LANG_JAVA is not set
-# CT_CC_LANG_ADA is not set
-# CT_CC_LANG_OBJC is not set
-# CT_CC_LANG_OBJCXX is not set
-# CT_CC_LANG_GOLANG is not set
-CT_CC_LANG_OTHERS=""
 
 #
 # Debug facilities
@@ -506,9 +492,8 @@ CT_GDB_GDBSERVER_HAS_IPA_LIB=y
 #
 # gdb version
 #
-# CT_GDB_CUSTOM is not set
+CT_GDB_VERSION="8.1"
-CT_GDB_VERSION="7.12.1"
+# CT_GDB_V_7_12_1 is not set
-CT_GDB_V_7_12_1=y
 # CT_GDB_V_7_11_1 is not set
 CT_GDB_7_12_or_later=y
 CT_GDB_7_2_or_later=y

linux-mips/Dockerfile.in

@@ -2,6 +2,9 @@ FROM dockcross/base:latest
 
 # This is for 32-bit Big-Endian MIPS devices with hard floating point enabled
 
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"
 
 # The cross-compiling emulator

linux-ppc64le/Dockerfile.in

@@ -1,6 +1,9 @@
 FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"
 
 ENV CROSS_TRIPLE powerpc64le-linux-gnu

linux-ppc64le/crosstool-ng.config

@@ -349,7 +349,7 @@ CT_CC_CORE_PASSES_NEEDED=y
 CT_CC_CORE_PASS_1_NEEDED=y
 CT_CC_CORE_PASS_2_NEEDED=y
 CT_CC_gcc=y
-CT_CC_GCC_VERSION="6.3.0"
+CT_CC_GCC_VERSION="7.3.0"
 # CT_CC_GCC_SHOW_LINARO is not set
 CT_CC_GCC_V_6_3_0=y
 # CT_CC_GCC_V_5_4_0 is not set

linux-s390x/Dockerfile.in

@@ -2,6 +2,9 @@ FROM dockcross/base:latest
 
 # This is for 64-bit S390X Linux machine
 
+# Crosstool-ng version
+ENV CT_VERSION crosstool-ng-1.23.0
+
 #include "common.crosstool"
 
 # The cross-compiling emulator

linux-s390x/crosstool-ng.config

@@ -343,7 +343,7 @@ CT_CC_CORE_PASSES_NEEDED=y
 CT_CC_CORE_PASS_1_NEEDED=y
 CT_CC_CORE_PASS_2_NEEDED=y
 CT_CC_gcc=y
-CT_CC_GCC_VERSION="6.3.0"
+CT_CC_GCC_VERSION="7.3.0"
 # CT_CC_GCC_SHOW_LINARO is not set
 CT_CC_GCC_V_6_3_0=y
 # CT_CC_GCC_V_5_4_0 is not set