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-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-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 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-pr-stale: 120
-          days-before-issue-close: 30
-          days-before-pr-close: 30
+          days-before-issue-stale: 240
+          days-before-pr-stale: 240
+          days-before-issue-close: 60
+          days-before-pr-close: 60

.github/workflows/main.yml

@@ -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
-          cd Stockfish
-          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src net
-          ./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -C src build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
-          cd ..
+          git clone --depth 1 --branch sf_15 https://github.com/official-stockfish/Stockfish.git
+          cd Stockfish/src
+          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} net
+          ./../../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} build ${{ matrix.arch_name.stockfish_arg }} -j${nproc}
+          cd ../..
           rm -rf Stockfish
 
       # Updated on 12/09/2022
@@ -1397,16 +1397,16 @@ jobs:
           cd ..
           rm -rf C
 
-      # Updated on 12/09/2022 No longer maintained
-      #- name: C-Plus-Plus build test
-      #  if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
-      #  run: |
-      #    git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
-      #    cd C-Plus-Plus
-      #    git checkout 0594923efa8e6b006a5d754c5e7976850290577c
-      #    ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
-      #    cd ..
-      #    rm -rf C-Plus-Plus
+      # Updated on 22/06/2025
+      - name: C-Plus-Plus build test
+        if: ${{ matrix.arch_name.C-Plus-Plus == 'yes' && (matrix.arch_name.multiarch == 'yes' || env.HOST_ARCH == 'amd64') }}
+        run: |
+          git clone https://github.com/TheAlgorithms/C-Plus-Plus.git
+          cd C-Plus-Plus
+          git checkout 93a700c7e947c8704df387564ea4780e6c031967
+          ./../tools/dockcross-cmake-builder.sh ${{ matrix.arch_name.image }} ${{ matrix.arch_name.C-Plus-Plus_arg }}
+          cd ..
+          rm -rf C-Plus-Plus
 
       # Updated on 03/08/2024
       - name: llama.cpp build test

Makefile

@@ -35,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 \
@@ -93,13 +95,6 @@ windows-armv7.test_ARGS = --exe-suffix ".exe"
 windows-arm64.test_ARGS = --exe-suffix ".exe"
 bare-armv7emhf-nano_newlib.test_ARGS = --linker-flags="--specs=nosys.specs"
 
-# On CircleCI, do not attempt to delete container
-# See https://circleci.com/docs/docker-btrfs-error/
-RM = --rm
-ifeq ("$(CIRCLECI)", "true")
-	RM =
-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)
 
@@ -124,20 +119,7 @@ test: base.test $(addsuffix .test,$(IMAGES))
 #
 
 $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOSITE_PATH)
-	sed \
-		-e '/common.docker/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.docker' \
-		-e '/common.debian/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.debian' \
-		-e '/common.manylinux_2_28/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux_2_28' \
-		-e '/common.manylinux_2_34/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux_2_34' \
-		-e '/common.manylinux2014/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.manylinux2014' \
-		-e '/common.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.crosstool' \
-		-e '/common.buildroot/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.buildroot' \
-		-e '/common-manylinux.crosstool/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common-manylinux.crosstool' \
-		-e '/common.webassembly/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.webassembly' \
-		-e '/common.windows/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.windows' \
-		-e '/common.dockcross/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.dockcross' \
-		-e '/common.label-and-env/ r $(DOCKER_COMPOSITE_FOLDER_PATH)common.label-and-env' \
-		$< > $@
+	sed $(foreach f,$(DOCKER_COMPOSITE_SOURCES),-e '/$(f)/ r $(DOCKER_COMPOSITE_FOLDER_PATH)$(f)') $< > $@
 
 #
 # web-wasm

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 \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
+    && apt-get autoremove --yes
 
 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 \
-    && cd /dockcross/buildroot \
-    && /dockcross/install-buildroot-toolchain.sh \
-    -c "/dockcross/buildroot.config" \
-    -v "${BR_VERSION}" \
-    && rm -rf /dockcross/buildroot /dockcross/install-buildroot-toolchain.sh
+RUN mkdir /dockcross/buildroot && cd /dockcross/buildroot && \
+    /dockcross/install-buildroot-toolchain.sh -c "/dockcross/buildroot.config" -v "${BR_VERSION}"
 
 # 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 \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
+    && apt-get autoremove --yes
 
 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
-    fi
-    if [[ -d /root/.cargo ]]; then
-        mv -t $HOME/ /root/.cargo
-    fi
+    mv -t $HOME/ /root/.rustup /root/.cargo
     # 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 --remote-submodules #--branch="$REV"
-cd buildroot
-git checkout "$REV"
-cp "$CONFIG_PATH" .config
-make
+git clone "$REPO_URL" --recurse-submodules --shallow-submodules --depth 1 --branch "$REV" buildroot
+# Only to generate the project files, config will be overwritten later
+make -C buildroot O=/aarch64_efi aarch64_efi_defconfig
+cp "$CONFIG_PATH" /aarch64_efi/.config
+FORCE_UNSAFE_CONFIGURE=1 make -C /aarch64_efi sdk
+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
-ENV BR_VERSION=d4877e6f88d5eea54dc74b855556ffc0dd3f399f
+# buildroot master 2025-06-22
+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

@@ -20,10 +20,7 @@ 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"