Merge 'dockcross/master'

.github/workflows/expired.yml

@@ -6,7 +6,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-milestones: 'future,alpha,beta,release,bugfix,improvement,enhancement,help wanted'

imagefiles/install-gosu-binary.sh

@@ -14,9 +14,44 @@ if ! command -v gpg &> /dev/null; then
 fi
 
 GOSU_VERSION=1.12
-dpkgArch=$(if test "$(uname -m)" = "x86_64"; then echo amd64; else echo i386; fi)
-url="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${dpkgArch}"
-url_key="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${dpkgArch}.asc"
+
+ARCH=$(uname -m)
+case "$ARCH" in
+    x86_64)
+        GOSU_ARCH=amd64
+        ;;
+    aarch64)
+        GOSU_ARCH=arm64
+        ;;
+    armv7l)
+        GOSU_ARCH=armhf
+        ;;
+    armv6l)
+        GOSU_ARCH=armel
+        ;;
+    i686|i386)
+        GOSU_ARCH=i386
+        ;;
+    mips64el)
+        GOSU_ARCH=mips64el
+        ;;
+    ppc64el)
+        GOSU_ARCH=ppc64el
+        ;;
+    riscv64)
+        GOSU_ARCH=riscv64
+        ;;
+    s390x)
+        GOSU_ARCH=s390x
+        ;;
+    *)
+        echo "Error: unsupported arch (${ARCH}) by gosu (https://github.com/tianon/gosu/releases)" >&2
+        exit 1
+        ;;
+esac
+
+url="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${GOSU_ARCH}"
+url_key="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${GOSU_ARCH}.asc"
 
 # download and verify the signature
 export GNUPGHOME="$(mktemp -d)"

linux-armv5/Dockerfile.in

@@ -38,7 +38,7 @@ 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/arm-linux-gnueabihf/
+ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabi/pkgconfig
 
 # Linux kernel cross compilation variables
 ENV PATH ${PATH}:${CROSS_ROOT}/bin

linux-riscv32/Dockerfile.in

@@ -39,11 +39,11 @@ WORKDIR /work
 COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
 ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
 
-ENV PKG_CONFIG_PATH /usr/lib/riscv64-unknown-linux-gnu/pkgconfig
+ENV PKG_CONFIG_PATH /usr/lib/riscv32-unknown-linux-gnu/pkgconfig
 
 # Linux kernel cross compilation variables
 ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH powerpc
+ENV ARCH riscv32
 
 #include "common.label-and-env"

linux-riscv64/Dockerfile.in

@@ -44,6 +44,6 @@ ENV PKG_CONFIG_PATH /usr/lib/riscv64-unknown-linux-gnu/pkgconfig
 # Linux kernel cross compilation variables
 ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH powerpc
+ENV ARCH riscv64
 
 #include "common.label-and-env"