From 98b76577e87dabb9ee64ec5627c6218dce63419d Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Mon, 31 Jan 2022 07:20:26 +0000 Subject: [PATCH] ALL: Various toolchains updates --- Makefile | 2 +- check-versions/config.py | 2 +- toolchains/android-common/functions-sdk.sh | 4 ++-- toolchains/apple-sdks/packages/xcode-extractor/build.sh | 2 +- toolchains/common/packages/fluidsynth/build.sh | 2 +- toolchains/common/packages/libsdl1.2/build.sh | 2 +- toolchains/common/packages/sdl-net1.2/build.sh | 2 +- toolchains/devkitarm/Dockerfile.m4 | 2 +- toolchains/devkitppc/Dockerfile.m4 | 2 +- toolchains/devkitswitch/Dockerfile.m4 | 2 +- toolchains/m4/debian-toolchain-base.m4 | 2 +- toolchains/macosx-common/packages/osxcross-clang/build.sh | 2 +- toolchains/macosx-common/packages/osxcross/build.sh | 2 +- toolchains/psp/packages/psp-packages/build.sh | 2 +- toolchains/psp/packages/toolchain/build.sh | 6 +++--- toolchains/riscos/packages/toolchain/build.sh | 2 +- toolchains/vita/packages/toolchain/build.sh | 4 ++-- workers/m4/debian-builder-base.m4 | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Makefile b/Makefile index 757e691e..de2e8ea7 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BUILDBOT_VERSION := 3.4.0 BUILDBOT_BASEDIR := buildbot-workdir BOTTLE_VERSION := 0.12.19 -TREQ_VERSION := 21.5.0 +TREQ_VERSION := 22.1.0 # Without toolchains/ part, all is a placeholder for all detected toolchains TOOLCHAINS_ENABLED := all diff --git a/check-versions/config.py b/check-versions/config.py index 66140440..cceaf034 100644 --- a/check-versions/config.py +++ b/check-versions/config.py @@ -500,7 +500,7 @@ ('./toolchains/psp/packages/toolchain/build.sh', 'GCC'): { 'check': 'git commit', 'repository': 'https://github.com/pspdev/gcc.git', - 'branch': 'allegrex-v9.3.0', + 'branch': 'allegrex-v11.2.0', }, ('./toolchains/psp/packages/toolchain/build.sh', 'NEWLIB'): { 'check': 'git commit', diff --git a/toolchains/android-common/functions-sdk.sh b/toolchains/android-common/functions-sdk.sh index bff3a7cc..4cb9e041 100644 --- a/toolchains/android-common/functions-sdk.sh +++ b/toolchains/android-common/functions-sdk.sh @@ -1,5 +1,5 @@ -CMDLINE_TOOLS_VERSION=7583922 -CMDLINE_TOOLS_CHECKSUM="sha256:124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf" +CMDLINE_TOOLS_VERSION=8092744 +CMDLINE_TOOLS_CHECKSUM="sha256:d71f75333d79c9c6ef5c39d3456c6c58c613de30e6a751ea0dbd433e8f8b9cbf" CMDLINE_TOOLS_SUBDIR=cmdline-tools do_install_sdk_tools () { diff --git a/toolchains/apple-sdks/packages/xcode-extractor/build.sh b/toolchains/apple-sdks/packages/xcode-extractor/build.sh index fd6b98cd..afe2be5b 100755 --- a/toolchains/apple-sdks/packages/xcode-extractor/build.sh +++ b/toolchains/apple-sdks/packages/xcode-extractor/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=062922bbb81ac52787d8e53fa4af190acb552ec7 +OSXCROSS_VERSION=be2b79f444aa0b43b8695a4fb7b920bf49ecc01c export PBZX_VERSION=2a4d7c3300c826d918def713a24d25c237c8ed53 export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0 diff --git a/toolchains/common/packages/fluidsynth/build.sh b/toolchains/common/packages/fluidsynth/build.sh index 44389aaf..f237a652 100755 --- a/toolchains/common/packages/fluidsynth/build.sh +++ b/toolchains/common/packages/fluidsynth/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -FLUIDSYNTH_VERSION=2.2.4 +FLUIDSYNTH_VERSION=2.2.5 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/common/packages/libsdl1.2/build.sh b/toolchains/common/packages/libsdl1.2/build.sh index 1ec1ceb2..969d0b27 100755 --- a/toolchains/common/packages/libsdl1.2/build.sh +++ b/toolchains/common/packages/libsdl1.2/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -SDL_VERSION=678fca3749cdd4f808dc8c5d175d7d31a8d5a4ea +SDL_VERSION=707e2cc25904bd4ea7ca94f45632e02d7dbee14c PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/common/packages/sdl-net1.2/build.sh b/toolchains/common/packages/sdl-net1.2/build.sh index eb84d96e..7755cbdc 100755 --- a/toolchains/common/packages/sdl-net1.2/build.sh +++ b/toolchains/common/packages/sdl-net1.2/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -SDL_NET_VERSION=dc8e96f0b873f1b593c56cf08a5a2731e4897e71 +SDL_NET_VERSION=87cf58228daa81208ab15c12cc44922dff90260d PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/devkitarm/Dockerfile.m4 b/toolchains/devkitarm/Dockerfile.m4 index c0ecbcaf..f7be6f61 100644 --- a/toolchains/devkitarm/Dockerfile.m4 +++ b/toolchains/devkitarm/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITARM_VERSION',20210726) +m4_define(`DEVKITARM_VERSION',20220128) # This version of devkitARM depends on a Debian Buster # For now it works with our version, we will have to ensure it stays like that FROM devkitpro/devkitarm:DEVKITARM_VERSION AS original-toolchain diff --git a/toolchains/devkitppc/Dockerfile.m4 b/toolchains/devkitppc/Dockerfile.m4 index 5be8c421..9cd1ef5c 100644 --- a/toolchains/devkitppc/Dockerfile.m4 +++ b/toolchains/devkitppc/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITPPC_VERSION',20220103) +m4_define(`DEVKITPPC_VERSION',20220128) # This version of devkitPPC depends on a Debian Buster # For now it works with our version, we will have to ensure it stays like that FROM devkitpro/devkitppc:DEVKITPPC_VERSION AS original-toolchain diff --git a/toolchains/devkitswitch/Dockerfile.m4 b/toolchains/devkitswitch/Dockerfile.m4 index 2510baa8..471fe5b7 100644 --- a/toolchains/devkitswitch/Dockerfile.m4 +++ b/toolchains/devkitswitch/Dockerfile.m4 @@ -1,4 +1,4 @@ -m4_define(`DEVKITA64_VERSION',20220103) +m4_define(`DEVKITA64_VERSION',20220128) # This version of devkitA64 depends on a Debian Buster # For now it works with our version, we will have to ensure it stays like that FROM devkitpro/devkita64:DEVKITA64_VERSION AS original-toolchain diff --git a/toolchains/m4/debian-toolchain-base.m4 b/toolchains/m4/debian-toolchain-base.m4 index d9099104..e0d31018 100644 --- a/toolchains/m4/debian-toolchain-base.m4 +++ b/toolchains/m4/debian-toolchain-base.m4 @@ -1,5 +1,5 @@ m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bullseye)') -m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20211220)') +m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20220125)') FROM toolchains/common AS helpers FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,) diff --git a/toolchains/macosx-common/packages/osxcross-clang/build.sh b/toolchains/macosx-common/packages/osxcross-clang/build.sh index 36aa3143..3ae8cbcb 100755 --- a/toolchains/macosx-common/packages/osxcross-clang/build.sh +++ b/toolchains/macosx-common/packages/osxcross-clang/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=062922bbb81ac52787d8e53fa4af190acb552ec7 +OSXCROSS_VERSION=be2b79f444aa0b43b8695a4fb7b920bf49ecc01c PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/macosx-common/packages/osxcross/build.sh b/toolchains/macosx-common/packages/osxcross/build.sh index 74d58005..b1861797 100755 --- a/toolchains/macosx-common/packages/osxcross/build.sh +++ b/toolchains/macosx-common/packages/osxcross/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -OSXCROSS_VERSION=062922bbb81ac52787d8e53fa4af190acb552ec7 +OSXCROSS_VERSION=be2b79f444aa0b43b8695a4fb7b920bf49ecc01c export XAR_VERSION=2b9a4ab7003f1db8c54da4fea55fcbb424fdecb0 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) diff --git a/toolchains/psp/packages/psp-packages/build.sh b/toolchains/psp/packages/psp-packages/build.sh index 26f4efa4..7f316bd2 100755 --- a/toolchains/psp/packages/psp-packages/build.sh +++ b/toolchains/psp/packages/psp-packages/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -PSP_PACKAGES_VERSION=009e7970e938743cdf42e7595986ccc68a3dd5e1 +PSP_PACKAGES_VERSION=6651ea449d32544bd0e110a53348437ea001ba27 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/psp/packages/toolchain/build.sh b/toolchains/psp/packages/toolchain/build.sh index 925d8a33..b2fbe0af 100755 --- a/toolchains/psp/packages/toolchain/build.sh +++ b/toolchains/psp/packages/toolchain/build.sh @@ -5,10 +5,10 @@ export PSPTOOLCHAIN_VERSION=b6c1547ee82eada94dcb07acdcfd7fd40a3f4421 export PSPSDK_VERSION=34f782175876c76603707d51b84f31e6f1bed41e export PSPLINKUSB_VERSION=dbf5b94dd973dc49ee28d596a03c1362bcbce9e3 export EBOOTSIGNER_VERSION=10cfbb51ea87adfe02d63dc3a262c8480fdf31e7 -export PSPTOOLCHAIN_ALLEGREX_VERSION=ee08e260b88b1ab4dd5ba71b0aa621fb6b28c35c +export PSPTOOLCHAIN_ALLEGREX_VERSION=e042e2e4b5ae8e9377cc18cab2cc14e27a9135f0 export PSPTOOLCHAIN_EXTRA_VERSION=880705e1993a43c8e0533e53e67bab6f3b57e202 -export BINUTILS_VERSION=684a872506aeda6c6ac37074df24e5d5ce23e808 -export GCC_VERSION=d2a03ce80d5dba86995fd4c4c408eaacc48e9f3e +export BINUTILS_VERSION=e9c864fd3776b1fef2e374568e47f442ec58c773 +export GCC_VERSION=873f9ff28c1ce079d48ca53f845fe0c88fa6961b export NEWLIB_VERSION=dd3c854d70d2a0b4293569433d262c9ade4d60a0 export PSP_PACMAN_VERSION=23e6b9389626a32336063e90c486aa4db73a74d7 diff --git a/toolchains/riscos/packages/toolchain/build.sh b/toolchains/riscos/packages/toolchain/build.sh index 9940acd2..b22d32f4 100755 --- a/toolchains/riscos/packages/toolchain/build.sh +++ b/toolchains/riscos/packages/toolchain/build.sh @@ -1,6 +1,6 @@ #! /bin/sh -GCCSDK_VERSION=7663 +GCCSDK_VERSION=7687 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/toolchains/vita/packages/toolchain/build.sh b/toolchains/vita/packages/toolchain/build.sh index 7eaa99ce..c4e29d69 100755 --- a/toolchains/vita/packages/toolchain/build.sh +++ b/toolchains/vita/packages/toolchain/build.sh @@ -1,8 +1,8 @@ #! /bin/sh -VITA_VERSION=2.252 +VITA_VERSION=2.263 # This one must be updated as well -PKG_DATE=2021-12-31_16-24-29 +PKG_DATE=2022-01-28_19-34-10 PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) HELPERS_DIR=$PACKAGE_DIR/../.. diff --git a/workers/m4/debian-builder-base.m4 b/workers/m4/debian-builder-base.m4 index 922bf102..c04e69d3 100644 --- a/workers/m4/debian-builder-base.m4 +++ b/workers/m4/debian-builder-base.m4 @@ -1,5 +1,5 @@ m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bullseye)') -m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20211220)') +m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20220125)') m4_define(`BASE_DEBIAN',`')m4_dnl FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim USER root