From aef4ee968c3739afaa710ae5dcfb23899ec5b5ec Mon Sep 17 00:00:00 2001 From: Damian Parrino Date: Thu, 25 Jun 2026 08:29:29 -0300 Subject: [PATCH 1/4] Revert "Fix config path bug (#147)" This reverts commit bf8b4c546b0cf8a57ad92377e8189614773a0aaf. --- scripts/001-binutils-PPU.sh | 2 +- scripts/005-binutils-SPU.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/001-binutils-PPU.sh b/scripts/001-binutils-PPU.sh index 4e4bf1d5..4d54e0f8 100755 --- a/scripts/001-binutils-PPU.sh +++ b/scripts/001-binutils-PPU.sh @@ -21,7 +21,7 @@ if [ ! -d ${BINUTILS} ]; then cat ../patches/${BINUTILS}-PS3.patch | patch -p1 -d ${BINUTILS} ## Replace config.guess and config.sub - cp ../config/config.guess ../config/config.sub ${BINUTILS} + cp ../archives/config.guess ../archives/config.sub ${BINUTILS} fi diff --git a/scripts/005-binutils-SPU.sh b/scripts/005-binutils-SPU.sh index 2f1f76d6..b2c2c218 100755 --- a/scripts/005-binutils-SPU.sh +++ b/scripts/005-binutils-SPU.sh @@ -21,7 +21,7 @@ if [ ! -d ${BINUTILS} ]; then cat ../patches/${BINUTILS}-PS3.patch | patch -p1 -d ${BINUTILS} ## Replace config.guess and config.sub - cp ../config/config.guess ../config/config.sub ${BINUTILS} + cp ../archives/config.guess ../archives/config.sub ${BINUTILS} fi From f52e34db0a889cf8f705e132a956db55ec7e894e Mon Sep 17 00:00:00 2001 From: Damian Parrino Date: Thu, 25 Jun 2026 09:20:48 -0300 Subject: [PATCH 2/4] fix path --- scripts/001-binutils-PPU.sh | 2 +- scripts/005-binutils-SPU.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/001-binutils-PPU.sh b/scripts/001-binutils-PPU.sh index 4d54e0f8..50c98916 100755 --- a/scripts/001-binutils-PPU.sh +++ b/scripts/001-binutils-PPU.sh @@ -21,7 +21,7 @@ if [ ! -d ${BINUTILS} ]; then cat ../patches/${BINUTILS}-PS3.patch | patch -p1 -d ${BINUTILS} ## Replace config.guess and config.sub - cp ../archives/config.guess ../archives/config.sub ${BINUTILS} + cp ./config.guess ./config.sub ${BINUTILS} fi diff --git a/scripts/005-binutils-SPU.sh b/scripts/005-binutils-SPU.sh index b2c2c218..a57aaaed 100755 --- a/scripts/005-binutils-SPU.sh +++ b/scripts/005-binutils-SPU.sh @@ -21,7 +21,7 @@ if [ ! -d ${BINUTILS} ]; then cat ../patches/${BINUTILS}-PS3.patch | patch -p1 -d ${BINUTILS} ## Replace config.guess and config.sub - cp ../archives/config.guess ../archives/config.sub ${BINUTILS} + cp ./config.guess ./config.sub ${BINUTILS} fi From 73751b94862c3f040eb7fe07e735134981139f4a Mon Sep 17 00:00:00 2001 From: Damian Parrino Date: Thu, 25 Jun 2026 18:37:52 -0300 Subject: [PATCH 3/4] Update get-config-scripts.sh Update get-config-scripts.sh --- config/get-config-scripts.sh | 9 ++++++++- scripts/001-binutils-PPU.sh | 2 +- scripts/005-binutils-SPU.sh | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/get-config-scripts.sh b/config/get-config-scripts.sh index 73b34f86..e094a03b 100755 --- a/config/get-config-scripts.sh +++ b/config/get-config-scripts.sh @@ -4,13 +4,20 @@ CONFIG_TIMEOUT="${CONFIG_TIMEOUT:-15}" CONFIG_BASE_URL="${CONFIG_BASE_URL:-https://git.savannah.gnu.org/cgit/config.git/plain}" SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -CONFIG_DIR="${SCRIPT_DIR}" +ROOT_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)" +CONFIG_DIR="${ROOT_DIR}/config" + +cd "${ROOT_DIR}/archives" fetch_config_file() { file="$1" url="${CONFIG_BASE_URL}/${file}" tmp="${file}.tmp" + if test -f "${file}"; then + return 0 + fi + echo "Fetching ${file} from Savannah, timeout ${CONFIG_TIMEOUT}s..." if command -v curl >/dev/null 2>&1; then diff --git a/scripts/001-binutils-PPU.sh b/scripts/001-binutils-PPU.sh index 50c98916..4d54e0f8 100755 --- a/scripts/001-binutils-PPU.sh +++ b/scripts/001-binutils-PPU.sh @@ -21,7 +21,7 @@ if [ ! -d ${BINUTILS} ]; then cat ../patches/${BINUTILS}-PS3.patch | patch -p1 -d ${BINUTILS} ## Replace config.guess and config.sub - cp ./config.guess ./config.sub ${BINUTILS} + cp ../archives/config.guess ../archives/config.sub ${BINUTILS} fi diff --git a/scripts/005-binutils-SPU.sh b/scripts/005-binutils-SPU.sh index a57aaaed..b2c2c218 100755 --- a/scripts/005-binutils-SPU.sh +++ b/scripts/005-binutils-SPU.sh @@ -21,7 +21,7 @@ if [ ! -d ${BINUTILS} ]; then cat ../patches/${BINUTILS}-PS3.patch | patch -p1 -d ${BINUTILS} ## Replace config.guess and config.sub - cp ./config.guess ./config.sub ${BINUTILS} + cp ../archives/config.guess ../archives/config.sub ${BINUTILS} fi From 96467044d0d977e8f150b95326e32548e8481a9b Mon Sep 17 00:00:00 2001 From: Damian Parrino Date: Fri, 26 Jun 2026 10:31:12 -0300 Subject: [PATCH 4/4] Update get-config-scripts.sh --- config/get-config-scripts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/get-config-scripts.sh b/config/get-config-scripts.sh index e094a03b..e1e20232 100755 --- a/config/get-config-scripts.sh +++ b/config/get-config-scripts.sh @@ -4,8 +4,8 @@ CONFIG_TIMEOUT="${CONFIG_TIMEOUT:-15}" CONFIG_BASE_URL="${CONFIG_BASE_URL:-https://git.savannah.gnu.org/cgit/config.git/plain}" SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +CONFIG_DIR="${SCRIPT_DIR}" ROOT_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)" -CONFIG_DIR="${ROOT_DIR}/config" cd "${ROOT_DIR}/archives"