ScummVM/dockerized-bb
1
0
Fork 0
mirror of https://github.com/scummvm/dockerized-bb.git synced 2026-05-21 05:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALL: Various toolchains updates

Browse Source
This commit is contained in:
Le Philousophe
2024-03-03 15:35:07 +00:00
parent 4af8eaee6f
commit 9f9d1523b6
15 changed files with 144 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -1,4 +1,4 @@
BUILDBOT_VERSION := 3.10.1
BUILDBOT_VERSION := 3.11.0
BUILDBOT_BASEDIR := buildbot-workdir
BOTTLE_VERSION := 0.12.25
check-versions/config.py
+3 -3
View File
@@ -471,17 +471,17 @@ VERSIONS = {
('./toolchains/psp/packages/toolchain/build.sh', 'GCC'): {
'check': 'git commit',
'repository': 'https://github.com/pspdev/gcc.git',
'branch': 'allegrex-v11.2.0',
'branch': 'allegrex-v13.2.0',
},
('./toolchains/psp/packages/toolchain/build.sh', 'NEWLIB'): {
'check': 'git commit',
'repository': 'https://github.com/pspdev/newlib.git',
'branch': 'allegrex-v4.3.0',
'branch': 'allegrex-v4.4.0',
},
('./toolchains/psp/packages/toolchain/build.sh', 'PTHREAD_EMBEDDED'): {
'check': 'git commit',
'repository': 'https://github.com/pspdev/pthread-embedded.git',
'branch': 'psp',
'branch': 'platform_agnostic',
},
('./toolchains/psp/packages/toolchain/build.sh', 'PSP_PACMAN'): {
'check': 'git commit',
toolchains/amigaos4/packages/libsdl2/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
SDL2_VERSION=2.28.4
SDL2_VERSION=2.30.0
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
toolchains/amigaos4/packages/toolchain/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
TOOLCHAIN_VERSION=882a81c82504deb90b760de0a0ba19d9e3128fd2
TOOLCHAIN_VERSION=1c02337633738751bf127f6854c279ddda833e8e
# Versions of components to use provided by toolchain
BINUTILS_VER=2.23.2
toolchains/devkitarm/Dockerfile.m4
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`DEVKITARM_VERSION',20230928)
m4_define(`DEVKITARM_VERSION',20240202)
# This version of devkitARM depends on a Debian Bullseye
# For now it works with our version, we will have to ensure it stays like that
FROM devkitpro/devkitarm:DEVKITARM_VERSION AS original-toolchain
toolchains/devkitppc/Dockerfile.m4
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`DEVKITPPC_VERSION',20231110)
m4_define(`DEVKITPPC_VERSION',20240220)
# This version of devkitPPC depends on a Debian Bullseye
# For now it works with our version, we will have to ensure it stays like that
FROM devkitpro/devkitppc:DEVKITPPC_VERSION AS original-toolchain
toolchains/devkitswitch/Dockerfile.m4
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`DEVKITA64_VERSION',20240120)
m4_define(`DEVKITA64_VERSION',20240224)
# This version of devkitA64 depends on a Debian Bullseye
# For now it works with our version, we will have to ensure it stays like that
FROM devkitpro/devkita64:DEVKITA64_VERSION AS original-toolchain
toolchains/m4/debian-toolchain-base.m4
+1 -1
View File
@@ -1,5 +1,5 @@
m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240110)')
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240211)')
FROM toolchains/common AS helpers
FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim m4_ifdef(`STAGE_IMAGE_NAME',AS STAGE_IMAGE_NAME,)
toolchains/ps3/packages/libraries/patches/00_fix_a52dec.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/scripts/023-a52dec.sh b/scripts/023-a52dec.sh
index f2e053d..80f3330 100755
--- a/scripts/023-a52dec.sh
+++ b/scripts/023-a52dec.sh
@@ -3,7 +3,7 @@
VER=0.7.4
## Download the source code.
-wget --continue https://liba52.sourceforge.io/files/a52dec-${VER}.tar.gz
+wget --continue http://deb.debian.org/debian/pool/main/a/a52dec/a52dec_${VER}.orig.tar.gz -O a52dec-${VER}.tar.gz
## Download an up-to-date config.guess and config.sub
if [ ! -f config.guess ]; then wget --continue http://git.savannah.gnu.org/cgit/config.git/plain/config.guess; fi
toolchains/psp/packages/psp-packages/build.sh
+1 -1
View File
@@ -1,6 +1,6 @@
#! /bin/sh
PSP_PACKAGES_VERSION=b1a8342bfba6cf4820c4d74ad88799d6e4c2b2c9
PSP_PACKAGES_VERSION=944442ad6bc1f9c93f68dabd6be9e6bac7d10bac
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
toolchains/psp/packages/toolchain/build.sh
+8 -8
View File
@@ -1,16 +1,16 @@
#! /bin/sh
PSPDEV_VERSION=eec6b217856c83b24b7b4b326238e0db323e55a6
PSPDEV_VERSION=d5c9ba96d8c6aafd23d0e4721617b657af5551bf
export PSPTOOLCHAIN_VERSION=10ef17d71ee4afd09e36069a38d727391d902b50
export PSPSDK_VERSION=8fc8beb72ab46ee9b6922505f0c1da199114c48a
export PSPLINKUSB_VERSION=694aa1e390c9b7ffbb882e667781aca14cb44659
export PSPSDK_VERSION=7e595e52568e3c3a48accf5229a22d4b9bda54cd
export PSPLINKUSB_VERSION=1405de0fc59322914ae32fad3f29bf0506722f04
export EBOOTSIGNER_VERSION=17d6386f034ac922f540ca78200961761b23ecae
export PSPTOOLCHAIN_ALLEGREX_VERSION=30ce261f43227bac95b5286c15be722ed61de7a6
export PSPTOOLCHAIN_EXTRA_VERSION=a80c9c8bb7fc2dbf0fa1407547307474c1bfa012
export PSPTOOLCHAIN_ALLEGREX_VERSION=348e108470630c2abeadacfadd81b7256d1dfc5a
export PSPTOOLCHAIN_EXTRA_VERSION=9645ce8d3fe03d9e18192d99d1aaaaee3da57389
export BINUTILS_VERSION=1bf9b3f9be9d82cc89374ca916cd4e8e6115dcf8
export GCC_VERSION=65cf73279bb91ff72e5327dd1621c206f027f761
export NEWLIB_VERSION=5c65a2e32e2caba2752b5c5f811a3f515491555e
export PTHREAD_EMBEDDED_VERSION=c7e2d5a7e810401174b0484979b6d29a2f1ab519
export GCC_VERSION=cbd5840ad74d19923abd0a058764e0ac0dc3c575
export NEWLIB_VERSION=16a46371ad030c4b7f604e09e1ddb27b2e655169
export PTHREAD_EMBEDDED_VERSION=b1e378bfdc7e4ddae89ee3b76bab9f286821af1b
export PSP_PACMAN_VERSION=aedc04981cd6125741916e0b4b1b4d42715af6fa
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
toolchains/psp/packages/toolchain/psptoolchain-allegrex-patches/00_set_versions.patch
+108 -84
View File
@@ -1,110 +1,134 @@
diff --git a/config/psptoolchain-allegrex-config.sh b/config/psptoolchain-allegrex-config.sh
index e71842a..29d5c80 100644
--- a/config/psptoolchain-allegrex-config.sh
+++ b/config/psptoolchain-allegrex-config.sh
@@ -1,13 +1,14 @@
#!/bin/bash
+# Don't use the override file as conflicts in this file will allow us to track branch changes
PSPTOOLCHAIN_ALLEGREX_BINUTILS_REPO_URL="https://github.com/pspdev/binutils-gdb.git"
-PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="allegrex-v2.37.0"
+PSPTOOLCHAIN_ALLEGREX_BINUTILS_DEFAULT_REPO_REF="$BINUTILS_VERSION"
PSPTOOLCHAIN_ALLEGREX_GCC_REPO_URL="https://github.com/pspdev/gcc.git"
-PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="allegrex-v13.2.0"
+PSPTOOLCHAIN_ALLEGREX_GCC_DEFAULT_REPO_REF="$GCC_VERSION"
PSPTOOLCHAIN_ALLEGREX_NEWLIB_REPO_URL="https://github.com/pspdev/newlib.git"
-PSPTOOLCHAIN_ALLEGREX_NEWLIB_DEFAULT_REPO_REF="allegrex-v4.4.0"
+PSPTOOLCHAIN_ALLEGREX_NEWLIB_DEFAULT_REPO_REF="$NEWLIB_VERSION"
PSPTOOLCHAIN_ALLEGREX_PTHREAD_EMBEDDED_REPO_URL="https://github.com/pspdev/pthread-embedded.git"
-PSPTOOLCHAIN_ALLEGREX_PTHREAD_EMBEDDED_DEFAULT_REPO_REF="platform_agnostic"
+PSPTOOLCHAIN_ALLEGREX_PTHREAD_EMBEDDED_DEFAULT_REPO_REF="$PTHREAD_EMBEDDED_VERSION"
if test -f "$PSPDEV_CONFIG_OVERRIDE"; then
source "$PSPDEV_CONFIG_OVERRIDE"
diff --git a/scripts/001-binutils.sh b/scripts/001-binutils.sh
index f9a21a0..042b722 100755
index af20a3d..58bb8ce 100755
--- a/scripts/001-binutils.sh
+++ b/scripts/001-binutils.sh
@@ -4,12 +4,12 @@
## Download the source code.
REPO_URL="https://github.com/pspdev/binutils-gdb.git"
REPO_FOLDER="binutils-gdb"
-BRANCH_NAME="allegrex-v2.37.0"
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b $BRANCH_NAME $REPO_URL $REPO_FOLDER && cd $REPO_FOLDER || { exit 1; }
-else
- cd $REPO_FOLDER && git fetch origin && git reset --hard origin/${BRANCH_NAME} || { exit 1; }
-fi
+
+mkdir "$REPO_FOLDER" && cd "$REPO_FOLDER"
+git init || { exit 1; }
+git remote add origin "$REPO_URL" || { exit 1; }
+git fetch --depth 1 origin "$BINUTILS_VERSION" || { exit 1; }
+git checkout FETCH_HEAD || { exit 1; }
@@ -22,13 +22,11 @@ if test -n "$1"; then
printf 'Using specified repo reference %s\n' "$REPO_REF"
fi
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
-else
- git -C "$REPO_FOLDER" fetch origin
- git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
- git -C "$REPO_FOLDER" checkout "$REPO_REF"
-fi
+mkdir "$REPO_FOLDER"
+git -C "$REPO_FOLDER" init
+git -C "$REPO_FOLDER" remote add origin "$REPO_URL"
+git -C "$REPO_FOLDER" fetch --depth 1 origin "$REPO_REF"
+git -C "$REPO_FOLDER" checkout FETCH_HEAD
cd "$REPO_FOLDER"
TARGET="psp"
TARG_XTRA_OPTS=""
diff --git a/scripts/002-gcc-stage1.sh b/scripts/002-gcc-stage1.sh
index 457512b..4203245 100755
index d8f537d..adf0759 100755
--- a/scripts/002-gcc-stage1.sh
+++ b/scripts/002-gcc-stage1.sh
@@ -4,12 +4,12 @@
## Download the source code.
REPO_URL="https://github.com/pspdev/gcc.git"
REPO_FOLDER="gcc"
-BRANCH_NAME="allegrex-v11.2.0"
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b $BRANCH_NAME $REPO_URL $REPO_FOLDER && cd $REPO_FOLDER || { exit 1; }
-else
- cd $REPO_FOLDER && git fetch origin && git reset --hard origin/${BRANCH_NAME} || { exit 1; }
-fi
+
+mkdir "$REPO_FOLDER" && cd "$REPO_FOLDER"
+git init || { exit 1; }
+git remote add origin "$REPO_URL" || { exit 1; }
+git fetch --depth 1 origin "$GCC_VERSION" || { exit 1; }
+git checkout FETCH_HEAD || { exit 1; }
@@ -22,13 +22,11 @@ if test -n "$1"; then
printf 'Using specified repo reference %s\n' "$REPO_REF"
fi
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
-else
- git -C "$REPO_FOLDER" fetch origin
- git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
- git -C "$REPO_FOLDER" checkout "$REPO_REF"
-fi
+mkdir "$REPO_FOLDER"
+git -C "$REPO_FOLDER" init
+git -C "$REPO_FOLDER" remote add origin "$REPO_URL"
+git -C "$REPO_FOLDER" fetch --depth 1 origin "$REPO_REF"
+git -C "$REPO_FOLDER" checkout FETCH_HEAD
cd "$REPO_FOLDER"
TARGET="psp"
OSVER=$(uname)
diff --git a/scripts/003-newlib.sh b/scripts/003-newlib.sh
index e30a362..6e2b4f3 100755
index 25e8e43..51bb7af 100755
--- a/scripts/003-newlib.sh
+++ b/scripts/003-newlib.sh
@@ -4,12 +4,12 @@
## Download the source code.
REPO_URL="https://github.com/pspdev/newlib.git"
REPO_FOLDER="newlib"
-BRANCH_NAME="allegrex-v4.3.0"
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || { exit 1; }
-else
- cd $REPO_FOLDER && git fetch origin && git reset --hard origin/${BRANCH_NAME} && git checkout ${BRANCH_NAME} || { exit 1; }
-fi
+
+mkdir "$REPO_FOLDER" && cd "$REPO_FOLDER"
+git init || { exit 1; }
+git remote add origin "$REPO_URL" || { exit 1; }
+git fetch --depth 1 origin "$NEWLIB_VERSION" || { exit 1; }
+git checkout FETCH_HEAD || { exit 1; }
@@ -22,13 +22,11 @@ if test -n "$1"; then
printf 'Using specified repo reference %s\n' "$REPO_REF"
fi
TARGET="psp"
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
-else
- git -C "$REPO_FOLDER" fetch origin
- git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
- git -C "$REPO_FOLDER" checkout "$REPO_REF"
-fi
+mkdir "$REPO_FOLDER"
+git -C "$REPO_FOLDER" init
+git -C "$REPO_FOLDER" remote add origin "$REPO_URL"
+git -C "$REPO_FOLDER" fetch --depth 1 origin "$REPO_REF"
+git -C "$REPO_FOLDER" checkout FETCH_HEAD
cd "$REPO_FOLDER"
diff --git a/scripts/004-pthread-embedded.sh b/scripts/004-pthread-embedded.sh
index adb8efe..0cbd349 100755
index 04a70fa..da197e8 100755
--- a/scripts/004-pthread-embedded.sh
+++ b/scripts/004-pthread-embedded.sh
@@ -5,11 +5,12 @@
REPO_URL="https://github.com/pspdev/pthread-embedded.git"
REPO_FOLDER="pthread-embedded"
BRANCH_NAME="psp"
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || { exit 1; }
-else
- cd $REPO_FOLDER && git fetch origin && git reset --hard origin/${BRANCH_NAME} && git checkout ${BRANCH_NAME} || { exit 1; }
-fi
+
+mkdir "$REPO_FOLDER" && cd "$REPO_FOLDER"
+git init || { exit 1; }
+git remote add origin "$REPO_URL" || { exit 1; }
+git fetch --depth 1 origin "$PTHREAD_EMBEDDED_VERSION" || { exit 1; }
+git checkout FETCH_HEAD || { exit 1; }
@@ -22,13 +22,11 @@ if test -n "$1"; then
printf 'Using specified repo reference %s\n' "$REPO_REF"
fi
TARGET="psp"
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
-else
- git -C "$REPO_FOLDER" fetch origin
- git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
- git -C "$REPO_FOLDER" checkout "$REPO_REF"
-fi
+mkdir "$REPO_FOLDER"
+git -C "$REPO_FOLDER" init
+git -C "$REPO_FOLDER" remote add origin "$REPO_URL"
+git -C "$REPO_FOLDER" fetch --depth 1 origin "$REPO_REF"
+git -C "$REPO_FOLDER" checkout FETCH_HEAD
cd "$REPO_FOLDER"
diff --git a/scripts/005-gcc-stage2.sh b/scripts/005-gcc-stage2.sh
index 8c1fc82..5d5f836 100755
index 9246fca..301717a 100755
--- a/scripts/005-gcc-stage2.sh
+++ b/scripts/005-gcc-stage2.sh
@@ -4,12 +4,8 @@
## Download the source code.
REPO_URL="https://github.com/pspdev/gcc.git"
REPO_FOLDER="gcc"
-BRANCH_NAME="allegrex-v11.2.0"
@@ -22,14 +22,6 @@ if test -n "$1"; then
printf 'Using specified repo reference %s\n' "$REPO_REF"
fi
-if test ! -d "$REPO_FOLDER"; then
- git clone --depth 1 -b $BRANCH_NAME $REPO_URL && cd $REPO_FOLDER || { exit 1; }
- git clone --depth 1 -b "$REPO_REF" "$REPO_URL" "$REPO_FOLDER"
-else
- cd $REPO_FOLDER && git fetch origin && git reset --hard origin/${BRANCH_NAME} || { exit 1; }
- git -C "$REPO_FOLDER" fetch origin
- git -C "$REPO_FOLDER" reset --hard "origin/$REPO_REF"
- git -C "$REPO_FOLDER" checkout "$REPO_REF"
-fi
+
+cd $REPO_FOLDER || { exit 1; }
-
cd "$REPO_FOLDER"
TARGET="psp"
OSVER=$(uname)
toolchains/vita/packages/toolchain/build.sh
+2 -2
View File
@@ -1,8 +1,8 @@
#! /bin/sh
VITA_VERSION=2.522
VITA_VERSION=2.525
# This one must be updated as well
PKG_DATE=2023-12-25_09-21-55
PKG_DATE=2024-02-05_05-05-05
PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
HELPERS_DIR=$PACKAGE_DIR/../..
workers/fetcher/Dockerfile.m4
+1 -1
View File
@@ -1,4 +1,4 @@
m4_define(`ALPINE_VERSION',3.19.0)m4_dnl
m4_define(`ALPINE_VERSION',3.19.1)m4_dnl
FROM alpine:ALPINE_VERSION
m4_define(`BASE_ALPINE',`')m4_dnl
USER root
workers/m4/debian-builder-base.m4
+1 -1
View File
@@ -1,5 +1,5 @@
m4_ifdef(`DEBIAN_RELEASE',,`m4_define(`DEBIAN_RELEASE',bookworm)')
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240110)')
m4_ifdef(`DEBIAN_VERSION',,`m4_define(`DEBIAN_VERSION',20240211)')
m4_define(`BASE_DEBIAN',`')m4_dnl
FROM debian:DEBIAN_RELEASE-DEBIAN_VERSION-slim
USER root