Enable SDL2 and Qt6

Update buildroot to 2025.05 (from 2021.09.20)
Improve build speed (remove unused apps and libs)
Update scripts
Update tests

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

.github/workflows/expired.yml

@@ -1,7 +1,7 @@
 name: 'Close stale issues and PRs'
 on:
   schedule:
-    - cron: '0 */8 * * *'
+    - cron: '0 0 */2 * *'
 jobs:
   stale:
     runs-on: ubuntu-latest
@@ -12,11 +12,11 @@ jobs:
           exempt-issue-milestones: 'future,alpha,beta,release,bugfix,improvement,enhancement,help wanted'
           exempt-pr-milestones: 'bugfix,improvement,enhancement,help wanted'
           exempt-all-pr-assignees: true
-          stale-issue-message: 'This issue is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
+          stale-issue-message: 'This issue is stale because it has been open 240 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
-          stale-pr-message: 'This PR is stale because it has been open 120 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
+          stale-pr-message: 'This PR is stale because it has been open 240 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
           close-pr-message: 'This PR was closed because it has been stalled for 30 days with no activity.'
-          days-before-issue-stale: 120
+          days-before-issue-stale: 240
-          days-before-pr-stale: 120
+          days-before-pr-stale: 240
-          days-before-issue-close: 30
+          days-before-issue-close: 60
-          days-before-pr-close: 30
+          days-before-pr-close: 60

.github/workflows/main.yml

@@ -126,8 +126,8 @@ jobs:
               openssl_arg: "android-arm no-shared",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -148,8 +148,8 @@ jobs:
               openssl_arg: "android-arm64 no-shared",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -170,8 +170,8 @@ jobs:
               openssl_arg: "android-x86 no-shared",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -192,8 +192,8 @@ jobs:
               openssl_arg: "android-x86_64 no-shared",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -215,8 +215,8 @@ jobs:
               openssl_arg: "linux-aarch64",
               C: "yes",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "yes",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -237,8 +237,8 @@ jobs:
               openssl_arg: "linux-aarch64",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -259,8 +259,8 @@ jobs:
               openssl_arg: "linux-aarch64",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -281,8 +281,8 @@ jobs:
               openssl_arg: "linux-aarch64",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -304,8 +304,8 @@ jobs:
               openssl_arg: "",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -327,8 +327,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -349,8 +349,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -371,8 +371,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -394,8 +394,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -416,8 +416,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -438,8 +438,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -461,8 +461,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -483,8 +483,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -505,8 +505,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -527,8 +527,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -549,8 +549,8 @@ jobs:
               openssl_arg: "linux-armv4",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -572,8 +572,8 @@ jobs:
               openssl_arg: "linux-x86",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -595,8 +595,8 @@ jobs:
               openssl_arg: "linux-generic32",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -618,8 +618,8 @@ jobs:
               openssl_arg: "linux-x86_64",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -640,8 +640,8 @@ jobs:
               openssl_arg: "linux-generic64 no-tests no-asm no-hw no-dtls no-shared no-dso",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -662,8 +662,8 @@ jobs:
               openssl_arg: "linux-x86_64-clang",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -684,8 +684,8 @@ jobs:
               openssl_arg: "linux-x86_64",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -707,8 +707,8 @@ jobs:
               openssl_arg: "linux-generic32",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -729,8 +729,8 @@ jobs:
               openssl_arg: "linux-generic64",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -752,8 +752,8 @@ jobs:
               openssl_arg: "linux64-s390x",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -775,8 +775,8 @@ jobs:
               openssl_arg: "linux-generic32",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -797,8 +797,8 @@ jobs:
               openssl_arg: "linux-generic32",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -820,8 +820,8 @@ jobs:
               openssl_arg: "linux-generic32",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -842,8 +842,8 @@ jobs:
               openssl_arg: "linux-ppc",
               C: "yes",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "yes",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -865,8 +865,8 @@ jobs:
               openssl_arg: "linux-ppc64le",
               C: "yes",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "yes",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -888,8 +888,8 @@ jobs:
               openssl_arg: "linux-ppc64le",
               C: "yes",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -911,8 +911,8 @@ jobs:
               openssl_arg: "linux-generic32 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -934,8 +934,8 @@ jobs:
               openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
               C: "no",
               C_arg: "",
-              TinyCC: "yes",
+              C-Plus-Plus: "yes",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -957,8 +957,8 @@ jobs:
               openssl_arg: "mingw64 no-asm",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -979,8 +979,8 @@ jobs:
               openssl_arg: "mingw64 no-asm",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1001,8 +1001,8 @@ jobs:
               openssl_arg: "mingw64 no-asm",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1023,8 +1023,8 @@ jobs:
               openssl_arg: "mingw64 no-asm",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1046,8 +1046,8 @@ jobs:
               openssl_arg: "mingw no-asm",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1068,8 +1068,8 @@ jobs:
               openssl_arg: "mingw no-asm",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -1091,8 +1091,8 @@ jobs:
               openssl_arg: "mingw no-asm",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1113,8 +1113,8 @@ jobs:
               openssl_arg: "mingw64 no-asm",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1136,8 +1136,8 @@ jobs:
               openssl_arg: "linux-x86_64",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1159,8 +1159,8 @@ jobs:
               openssl_arg: "linux-x86",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1181,8 +1181,8 @@ jobs:
               openssl_arg: "linux-x86_64",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "yes",
@@ -1203,8 +1203,8 @@ jobs:
               openssl_arg: "linux-aarch64",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -1226,8 +1226,8 @@ jobs:
               openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -1248,8 +1248,8 @@ jobs:
               openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -1270,8 +1270,8 @@ jobs:
               openssl_arg: "linux-generic64 no-asm no-threads no-engine no-hw no-weak-ssl-ciphers no-dtls no-shared no-dso",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -1293,8 +1293,8 @@ jobs:
               openssl_arg: "",
               C: "no",
               C_arg: "",
-              TinyCC: "no",
+              C-Plus-Plus: "no",
-              TinyCC_arg: "",
+              C-Plus-Plus_arg: "",
               llama_cpp: "no",
               llama_cpp_arg: "",
               fmt: "no",
@@ -1354,15 +1354,15 @@ jobs:
             make ${{ matrix.arch_name.image }}.test
           fi
 
-      # Updated on 15/07/2025
+      # Updated on 19/05/2022
       - name: stockfish build test
         if: ${{ matrix.arch_name.stockfish == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
         run: |
-          git clone --depth 1 --branch sf_17.1 https://github.com/official-stockfish/Stockfish.git
+          git clone --depth 1 --branch sf_15 https://github.com/official-stockfish/Stockfish.git
-          cd Stockfish
+          cd Stockfish/src
-          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src net
+          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net
-          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
+          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
-          cd ..
+          cd ../..
           rm -rf Stockfish
 
       # Updated on 12/09/2022
@@ -1397,17 +1397,16 @@ jobs:
           cd ..
           rm -rf C
 
-      # Updated on 02/08/2025
+      # Updated on 22/06/2025
-      - name: TinyCC build test
+      - name: C-Plus-Plus build test
-        if: ${{ matrix.arch_name.TinyCC == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
         run: |
-          git clone https://github.com/TinyCC/tinycc.git
+          git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
-          cd tinycc
+          cd C-Plus-Plus
-          git checkout 666e88ee2a66366a81497b4e927b02c69f18a165
+          git checkout 93a700c7e947c8704df387564ea4780e6c031967
-          ./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./configure --cpu=x86_64 ${{ matrix.arch_name.TinyCC_arg }}
+          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
-          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j${nproc}
           cd ..
-          rm -rf tinycc
+          rm -rf C-Plus-Plus
 
       # Updated on 03/08/2024
       - name: llama.cpp build test

Makefile

@@ -9,8 +9,6 @@
 DOCKER := $(or $(OCI_EXE), docker)
 BUILD_DOCKER := $(or $(BUILD_DOCKER), $(DOCKER))
 BUILDAH := $(or $(BUILDAH_EXE), buildah)
-RM = --rm
-
 # Name of the docker-equivalent executable for running test containers.
 # Supports the use case:
 #
@@ -37,6 +35,8 @@ HOST_ARCH := $(or $(HOST_ARCH), $(shell uname -m | sed -e 's/x86_64/amd64/' -e '
 # Directory where to generate the dockcross script for each images (e.g bin/dockcross-manylinux2014-x64)
 BIN = ./bin
 
+RM = --rm
+
 # These images are built using the "build implicit rule"
 STANDARD_IMAGES := android-arm android-arm64 android-x86 android-x86_64 \
 	linux-i686 linux-x86 linux-x64 linux-x64-clang linux-arm64-musl linux-arm64-full \
@@ -117,6 +117,7 @@ test: base.test $(addsuffix .test,$(IMAGES))
 #
 # Generic Targets (can specialize later).
 #
+
 $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOSITE_PATH)
 	sed $(foreach f,$(DOCKER_COMPOSITE_SOURCES),-e '/$(f)/ r $(DOCKER_COMPOSITE_FOLDER_PATH)$(f)') $< > $@
 

android-arm/Dockerfile.in

@@ -17,7 +17,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION=28b
+ENV ANDROID_NDK_REVISION=25b
 ENV ANDROID_API=23
 
 RUN mkdir -p /build && \

android-arm64/Dockerfile.in

@@ -21,7 +21,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION=28b
+ENV ANDROID_NDK_REVISION=25b
 ENV ANDROID_API=23
 
 RUN mkdir -p /build && \

android-x86/Dockerfile

@@ -11,7 +11,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION=28b
+ENV ANDROID_NDK_REVISION=25b
 ENV ANDROID_API=23
 
 RUN mkdir -p /build && \

android-x86_64/Dockerfile

@@ -11,7 +11,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
     CXX=${CROSS_ROOT}/bin/clang++ \
     LD=${CROSS_ROOT}/bin/ld
 
-ENV ANDROID_NDK_REVISION=28b
+ENV ANDROID_NDK_REVISION=25b
 ENV ANDROID_API=23
 
 RUN mkdir -p /build && \

common/common.buildroot

@@ -10,8 +10,7 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
     libtool \
     libtool-bin \
     && apt-get clean autoclean --yes \
-    && apt-get autoremove --yes \
+    && apt-get autoremove --yes
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 COPY \
   imagefiles/install-buildroot-toolchain.sh \
@@ -19,12 +18,8 @@ COPY \
   /dockcross/
 
 # Build and install the toolchain, cleaning up artifacts afterwards.
-RUN mkdir /dockcross/buildroot \
+RUN mkdir /dockcross/buildroot && cd /dockcross/buildroot && \
-    && cd /dockcross/buildroot \
+    /dockcross/install-buildroot-toolchain.sh -c "/dockcross/buildroot.config" -v "${BR_VERSION}"
-    && /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

@@ -26,8 +26,7 @@ RUN apt-get update --yes && apt-get install --no-install-recommends --yes \
     libtool \
     libtool-bin \
     && apt-get clean autoclean --yes \
-    && apt-get autoremove --yes \
+    && apt-get autoremove --yes
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 ENV XCC_PREFIX=/usr/xcc
 

common/common.debian

@@ -42,5 +42,4 @@ RUN \
     python-is-python3 \
     && apt-get clean autoclean --yes \
     && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/ \
     && rm /etc/ssh/*key*

imagefiles/build-and-install-openssh.sh

@@ -22,7 +22,9 @@ autoreconf
 
 ./configure --with-ssl-dir=/usr/local/ssl --prefix=/usr/local --with-libs=-lpthread
 
-make -j1 install
+
+make -j"$(nproc)"
+make install
 
 cd /usr/src
 rm -rf ${OPENSSH_SRC_DIR}

imagefiles/entrypoint.sh

@@ -28,17 +28,12 @@ if [[ -n $BUILDER_UID ]] && [[ -n $BUILDER_GID ]]; then
     useradd -o -m -g "$BUILDER_GID" -u "$BUILDER_UID" "$BUILDER_USER" 2> /dev/null
 
     # Change ownership of /dev/pts/0 to new user
-    chown "$BUILDER_UID" /dev/pts/0 2> /dev/null
+    chown "$BUILDER_UID" /dev/pts/0
 
     export HOME=/home/${BUILDER_USER}
     shopt -s dotglob
     # Move rustup/cargo directories as they are large, and not needed as root
-    if [[ -d /root/.rustup ]]; then
+    mv -t $HOME/ /root/.rustup /root/.cargo
-        mv -t $HOME/ /root/.rustup
-    fi
-    if [[ -d /root/.cargo ]]; then
-        mv -t $HOME/ /root/.cargo
-    fi
     # Copy the rest
     cp -r /root/* $HOME/
     chown -R $BUILDER_UID:$BUILDER_GID $HOME

imagefiles/install-buildroot-toolchain.sh

@@ -10,7 +10,7 @@ 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"
+REV="2025.05"
 while getopts "c:v:" o; do
   case "${o}" in
   c)
@@ -35,9 +35,9 @@ if [ -z ${REV} ]; then
   echo "WARNING: No version selected, use default version: $REV (-v)."
 fi
 
-
+git clone "$REPO_URL" --recurse-submodules --shallow-submodules --depth 1 --branch "$REV" buildroot
-git clone "$REPO_URL" --recurse-submodules --remote-submodules #--branch="$REV"
+# Only to generate the project files, config will be overwritten later
-cd buildroot
+make -C buildroot O=/aarch64_efi aarch64_efi_defconfig
-git checkout "$REV"
+cp "$CONFIG_PATH" /aarch64_efi/.config
-cp "$CONFIG_PATH" .config
+FORCE_UNSAFE_CONFIGURE=1 make -C /aarch64_efi sdk
-make
+rm -rf buildroot /aarch64_efi/build /aarch64_efi/images /aarch64_efi/staging /aarch64_efi/target/

imagefiles/install-gosu-binary.sh

@@ -56,7 +56,6 @@ url_key="https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$
 # download and verify the signature
 export GNUPGHOME="$(mktemp -d)"
 
-gpg --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://pgp.key-server.io:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 || \
 gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4

linux-arm64-full/Dockerfile.in

@@ -6,8 +6,8 @@ LABEL maintainer="Matt McCormick matt@mmmccormick.com"
 # This is for 64-bit ARM Linux machine
 
 # Buildroot version
-# buildroot master 2021-09-20
+# buildroot master 2025-06-22
-ENV BR_VERSION=d4877e6f88d5eea54dc74b855556ffc0dd3f399f
+ENV BR_VERSION=2025.05
 
 #include "common.buildroot"
 
@@ -20,7 +20,7 @@ RUN apt-get update \
 
 # 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 CROSS_ROOT=/aarch64_efi/host
 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
     CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \

tools/dockcross-cmake-builder.sh

@@ -21,9 +21,6 @@ if (( $# >= 1 )); then
     cmake_arg=$*
     echo "cmake arg: $cmake_arg"
     
-#    echo "Pulling dockcross/$image"
-#    docker pull "dockcross/$image:$tag"
-
     echo "Make script dockcross-$image"
     docker run --rm dockcross/"$image:$tag" > ./dockcross-"$image"
     chmod +x ./dockcross-"$image"