Fix clang image

Fix clang image

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

.github/workflows/expired.yml

@@ -6,7 +6,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3
+      - uses: actions/stale@v4
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-milestones: 'future,alpha,beta,release'

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
   image:
     name: ${{ matrix.arch_name }}
     needs: base
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:

.github/workflows/shellcheck.yml

@@ -0,0 +1,28 @@
+name: Shellcheck CI
+
+on:
+  push:
+    branches:
+    - '*'
+    paths-ignore:
+      - '**/README.md'
+  pull_request:
+    branches:
+    - '*'
+    paths-ignore:
+      - '**/README.md'
+  workflow_dispatch:
+
+jobs:
+  shellcheck:
+    name: Shellcheck
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Run ShellCheck
+      uses: ludeeus/action-shellcheck@master
+      with:
+        severity: error
+        format: gcc
+      env:
+        SHELLCHECK_OPTS: -s bash

Makefile

@@ -50,6 +50,12 @@ endif
 # Tag images with date and Git short hash in addition to revision
 TAG := $(shell date '+%Y%m%d')-$(shell git rev-parse --short HEAD)
 
+# shellcheck executable
+SHELLCHECK := shellcheck
+
+# Defines the level of verification (error, warning, info...)
+SHELLCHECK_SEVERITY_LEVEL := error
+
 #
 # images: This target builds all IMAGES (because it is the first one, it is built by default)
 #
@@ -275,6 +281,11 @@ purge: clean
 # Remove all images with organization (ex dockcross/*)
 	$(DOCKER) images --filter=reference='$(ORG)/*' --format='{{.Repository}}:{{.Tag}}' | xargs -r $(DOCKER) rmi -f
 
+# Check bash syntax
+bash-check:
+	find . -type f \( -name "*.sh" -o -name "*.bash" \) -print0 | xargs -0 -P"$(shell nproc)" -I{} \
+		$(SHELLCHECK) --check-sourced --color=auto --format=gcc --severity=error --shell=bash --enable=all "{}"
+
 #
 # testing implicit rule
 #

common/common.dockcross

@@ -13,4 +13,4 @@ RUN \
   rm -rf /buildscripts
 
 # Runtime scripts
-COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/
+COPY imagefiles/entrypoint.sh imagefiles/dockcross.sh /dockcross/

imagefiles/dockcross.sh

@@ -6,11 +6,11 @@ DEFAULT_DOCKCROSS_IMAGE=dockcross/base  # DO NOT MOVE THIS LINE (see entrypoint.
 # Helpers
 #
 err() {
-    echo -e >&2 ERROR: $@\\n
+    echo -e >&2 "ERROR: $*\n"
 }
 
 die() {
-    err $@
+    err "$*"
     exit 1
 }
 

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

linux-m68k-uclibc/Dockerfile.in

@@ -6,7 +6,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # crosstool-ng master 2021-07-07
 ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
-ENV QEMU_VERSION 6.0.0
+ARG QEMU_VERSION=6.0.0
 
 #include "common.crosstool"
 

linux-ppc64le/Dockerfile.in

@@ -6,7 +6,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # crosstool-ng master 2021-07-07
 ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
-ENV QEMU_VERSION 6.0.0
+ARG QEMU_VERSION=6.0.0
 
 #include "common.crosstool"
 

linux-riscv32/Dockerfile.in

@@ -6,7 +6,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # crosstool-ng master 2021-07-07
 ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
-ENV QEMU_VERSION 6.0.0
+ARG QEMU_VERSION=6.0.0
 
 #include "common.crosstool"
 

linux-riscv64/Dockerfile.in

@@ -6,7 +6,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # crosstool-ng master 2021-07-07
 ENV CT_VERSION 62e9db247be34f8a4fa3bc116e60a1b15db62a97
 
-ENV QEMU_VERSION 6.0.0
+ARG QEMU_VERSION=6.0.0
 
 #include "common.crosstool"
 

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/cc cc /usr/bin/clang-${CLANG_VERSION} 90 \
-    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 90 \
+    && update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-${CLANG_VERSION} 90 \
-    && update-alternatives --install /usr/bin/cpp cpp /usr/bin/clang++ 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