From 176e7a0bbbf6c295460102d4aa114764e3ee6757 Mon Sep 17 00:00:00 2001 From: "Dieter Demerre (be971243@md2v08qc.ebp.be.siemens-mobility)" Date: Mon, 19 Jul 2021 14:18:59 +0200 Subject: [PATCH 1/5] CYGWIN: introduce cygwin host system awareness. --- imagefiles/dockcross | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/imagefiles/dockcross b/imagefiles/dockcross index a6dc199..4b8d9c4 100755 --- a/imagefiles/dockcross +++ b/imagefiles/dockcross @@ -187,6 +187,8 @@ FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}} UBUNTU_ON_WINDOWS=$([ -e /proc/version ] && grep -l Microsoft /proc/version || echo "") # MSYS, Git Bash, etc. MSYS=$([ -e /proc/version ] && grep -l MINGW /proc/version || echo "") +# CYGWIN +CYGWIN=$([ -e /proc/version ] && grep -l CYGWIN /proc/version || echo "") if [ -z "$UBUNTU_ON_WINDOWS" -a -z "$MSYS" ]; then USER_IDS=(-e BUILDER_UID="$( id -u )" -e BUILDER_GID="$( id -g )" -e BUILDER_USER="$( id -un )" -e BUILDER_GROUP="$( id -gn )") @@ -209,6 +211,11 @@ elif [ -n "$MSYS" ]; then HOST_PWD=$PWD HOST_PWD=${HOST_PWD/\//} HOST_PWD=${HOST_PWD/\//:\/} +elif [ -n "$CYGWIN" ]; then + for f in pwd readlink cygpath ; do + test -n "$(type "${f}" )" || { echo >&2 "Missing functionality (${f}) (in cygwin)." ; exit 1 ; } ; + done ; + HOST_PWD="$( cygpath -w "$( readlink -f "$( pwd ;)" ; )" ; )" ; else HOST_PWD=$PWD [ -L $HOST_PWD ] && HOST_PWD=$(readlink $HOST_PWD) @@ -221,7 +228,11 @@ fi HOST_VOLUMES= if [ -e "$SSH_DIR" -a -z "$MSYS" ]; then - HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" + if test -n "${CYGWIN}" ; then + HOST_VOLUMES+="-v $(cygpath -w ${SSH_DIR} ; ):/home/$(id -un)/.ssh" ; + else + HOST_VOLUMES+="-v $SSH_DIR:/home/$(id -un)/.ssh" ; + fi ; fi #------------------------------------------------------------------------------ From f50d66b287aed6d50a88ade4a08492a307cb599e Mon Sep 17 00:00:00 2001 From: "Dieter Demerre (be971243@md2v08qc.ebp.be.siemens-mobility)" Date: Mon, 26 Jul 2021 09:44:24 +0200 Subject: [PATCH 2/5] empty commit - to trigger new build in pull request. From 8f19ce75f0d5844b51bd4aab7098ff3668e4f7c1 Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 11:17:08 +0200 Subject: [PATCH 3/5] Fix wrong file name in entrypoint dockcross -> dockcross.sh Fix wrong file name in entrypoint dockcross -> dockcross.sh Signed-off-by: Bensuperpc --- imagefiles/entrypoint.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imagefiles/entrypoint.sh b/imagefiles/entrypoint.sh index 103ab14..6b24ac8 100755 --- a/imagefiles/entrypoint.sh +++ b/imagefiles/entrypoint.sh @@ -7,13 +7,13 @@ if [[ $# == 0 ]]; then # Presumably the image has been run directly, so help the user get # started by outputting the dockcross script if [[ -n $DEFAULT_DOCKCROSS_IMAGE ]]; then - head -n 2 /dockcross/dockcross + head -n 2 /dockcross/dockcross.sh echo "DEFAULT_DOCKCROSS_IMAGE=$DEFAULT_DOCKCROSS_IMAGE" - tail -n +4 /dockcross/dockcross | + tail -n +4 /dockcross/dockcross.sh | sed -e "s@dockcross\/linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE}@g" | sed -e "s@dockcross\-linux\-armv7@${DEFAULT_DOCKCROSS_IMAGE//[\/:]/-}@g" else - cat /dockcross/dockcross + cat /dockcross/dockcross.sh fi exit 0 fi From ca7679dc14bf365b82f9d646e6c70fe54209131f Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 13:14:05 +0200 Subject: [PATCH 4/5] Fix clang image Fix clang image Signed-off-by: Bensuperpc --- linux-x64-clang/Dockerfile.in | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/linux-x64-clang/Dockerfile.in b/linux-x64-clang/Dockerfile.in index e362e65..cf7027e 100644 --- a/linux-x64-clang/Dockerfile.in +++ b/linux-x64-clang/Dockerfile.in @@ -1,26 +1,33 @@ FROM dockcross/base:latest MAINTAINER Matt McCormick "matt.mccormick@kitware.com" - # flang + +ARG CLANG_VERSION=13 +ENV CLANG_VERSION=${CLANG_VERSION} + RUN echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \ + && echo "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \ && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye main" >> /etc/apt/sources.list \ + && echo "deb-src http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-${CLANG_VERSION} main" >> /etc/apt/sources.list \ && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ && apt-get update \ && apt-get purge --autoremove -y gcc g++ software-properties-common \ - && apt-get -y install clang libc++-dev libc++abi-dev clang-format clang-tidy lldb \ + && apt-get -y install clang-${CLANG_VERSION} libc++-${CLANG_VERSION}-dev libc++abi-${CLANG_VERSION}-dev clang-format-${CLANG_VERSION} clang-tidy-${CLANG_VERSION} lldb-${CLANG_VERSION} \ && apt-get clean --yes \ && rm -rf /var/lib/apt/lists/* \ - && update-alternatives --install /usr/bin/cc cc /usr/bin/clang 90 \ - && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 90 \ - && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++ 90 \ + && update-alternatives --install /usr/bin/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \ + && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 90 \ + && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++-${CLANG_VERSION} 90 \ + && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-${CLANG_VERSION} 90 \ + && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-${CLANG_VERSION} 90 \ && cc --version \ && c++ --version \ && cpp --version ENV CROSS_TRIPLE x86_64-linux-gnu ENV CROSS_ROOT /usr/bin -ENV CC=/usr/bin/clang \ +ENV CC=/usr/bin/clang \ CPP=/usr/bin/cpp \ - CXX=/usr/bin/clang++ \ + CXX=/usr/bin/clang++ \ LD=/usr/bin/lld \ FC=/usr/bin/flang From f22865db7f94fbaad46b85ff32275548d6ac6b5a Mon Sep 17 00:00:00 2001 From: Bensuperpc Date: Wed, 4 Aug 2021 15:12:10 +0200 Subject: [PATCH 5/5] Update crosstool-ng, mxe and wasm Update crosstool-ng, mxe and wasm Signed-off-by: Bensuperpc --- common/common.windows | 4 ++-- linux-arm64/Dockerfile.in | 4 ++-- linux-armv5-musl/Dockerfile.in | 4 ++-- linux-armv5/Dockerfile.in | 4 ++-- linux-armv6/Dockerfile.in | 4 ++-- linux-armv7/Dockerfile.in | 4 ++-- linux-armv7a/Dockerfile.in | 4 ++-- linux-m68k-uclibc/Dockerfile.in | 4 ++-- linux-mips/Dockerfile.in | 4 ++-- linux-ppc64le/Dockerfile.in | 4 ++-- linux-riscv32/Dockerfile.in | 4 ++-- linux-riscv64/Dockerfile.in | 4 ++-- linux-s390x/Dockerfile.in | 4 ++-- web-wasm/Dockerfile.in | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/common/common.windows b/common/common.windows index ec8d09c..0d71e6c 100644 --- a/common/common.windows +++ b/common/common.windows @@ -15,8 +15,8 @@ # ARG MXE_TARGET_LINK=shared # -# mxe master 2021-07-07 -ARG MXE_GIT_TAG=29aac96601e6428900b1e9b2befb4cc567aff298 +# mxe master 2021-08-04 +ARG MXE_GIT_TAG=91e21fc4bc0775790b0a7cc3f7da4aef89637a0f ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/${MXE_TARGET_ARCH}-w64-mingw32.${MXE_TARGET_LINK}${MXE_TARGET_THREAD}/share/cmake/mxe-conf.cmake diff --git a/linux-arm64/Dockerfile.in b/linux-arm64/Dockerfile.in index d710e50..814152a 100644 --- a/linux-arm64/Dockerfile.in +++ b/linux-arm64/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv5-musl/Dockerfile.in b/linux-armv5-musl/Dockerfile.in index 86e68ee..5928f16 100755 --- a/linux-armv5-musl/Dockerfile.in +++ b/linux-armv5-musl/Dockerfile.in @@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # musleabi as default glibc # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv5/Dockerfile.in b/linux-armv5/Dockerfile.in index 4e7c045..9883a80 100644 --- a/linux-armv5/Dockerfile.in +++ b/linux-armv5/Dockerfile.in @@ -6,8 +6,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in index 630c814..15070e3 100644 --- a/linux-armv6/Dockerfile.in +++ b/linux-armv6/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e # This is for 32-bit ARMv6 Linux # Raspberry Pi is ARMv6+VFP2 diff --git a/linux-armv7/Dockerfile.in b/linux-armv7/Dockerfile.in index 8ba204a..9e5b646 100644 --- a/linux-armv7/Dockerfile.in +++ b/linux-armv7/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e # This is for 32-bit ARMv7 Linux #include "common.crosstool" diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in index 56e1833..3afd57a 100644 --- a/linux-armv7a/Dockerfile.in +++ b/linux-armv7a/Dockerfile.in @@ -4,8 +4,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # This is for 32-bit ARMv7 Linux # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-m68k-uclibc/Dockerfile.in b/linux-m68k-uclibc/Dockerfile.in index bcedd8c..cc2e259 100644 --- a/linux-m68k-uclibc/Dockerfile.in +++ b/linux-m68k-uclibc/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-mips/Dockerfile.in b/linux-mips/Dockerfile.in index 2af6798..a288424 100644 --- a/linux-mips/Dockerfile.in +++ b/linux-mips/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in index 9ae0583..af74e8d 100644 --- a/linux-ppc64le/Dockerfile.in +++ b/linux-ppc64le/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-riscv32/Dockerfile.in b/linux-riscv32/Dockerfile.in index 03cb82c..fa5b681 100644 --- a/linux-riscv32/Dockerfile.in +++ b/linux-riscv32/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-riscv64/Dockerfile.in b/linux-riscv64/Dockerfile.in index c80dbe3..61b9f04 100644 --- a/linux-riscv64/Dockerfile.in +++ b/linux-riscv64/Dockerfile.in @@ -3,8 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e ARG QEMU_VERSION=6.0.0 diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in index d7004ad..b5d9464 100644 --- a/linux-s390x/Dockerfile.in +++ b/linux-s390x/Dockerfile.in @@ -4,8 +4,8 @@ FROM dockcross/base:latest # Crosstool-ng version # We use a git commit while waiting for 1.25 to release (1.24 is several years old) -# crosstool-ng master 2021-07-07 -ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97 +# crosstool-ng master 2021-08-04 +ENV CT_VERSION d47b234152980a09196355b77a12cb425f3f1d2e #include "common.crosstool" diff --git a/web-wasm/Dockerfile.in b/web-wasm/Dockerfile.in index 47d500b..94f7d29 100644 --- a/web-wasm/Dockerfile.in +++ b/web-wasm/Dockerfile.in @@ -1,4 +1,4 @@ -FROM emscripten/emsdk:2.0.25 +FROM emscripten/emsdk:2.0.26 MAINTAINER Matt McCormick "matt.mccormick@kitware.com" # Revert back to "/bin/sh" as default shell @@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python #include "common.docker" -ENV EMSCRIPTEN_VERSION 2.0.25 +ENV EMSCRIPTEN_VERSION 2.0.26 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH} ENV CC=/emsdk/upstream/emscripten/emcc \