From 1b768e15243c2a0cb409e910f752e9f9dcaea568 Mon Sep 17 00:00:00 2001 From: wiidev Date: Sun, 1 Aug 2021 18:00:18 +0100 Subject: [PATCH] Update the build tools --- .github/workflows/main.yml | 44 +++++++++++++++++--------------------- Dockerfile | 25 +++++++++++----------- svnrev.sh | 8 +++---- 3 files changed, 36 insertions(+), 41 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c2067cdf..66a4aae5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,26 +22,26 @@ jobs: path: cache key: ${{ runner.os }}-cache-1 - - name: Download devkitPPC r38, libogc 2.1.0 and required tools + - name: Download devkitPPC r39, libogc 2.3.1 and required tools if: steps.cache-1.outputs.cache-hit != 'true' # general-tools is needed for bin2s and gamecube-tools is needed for elf2dol & gcdsptool run: | mkdir cache && cd cache - wget "https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r38-1-linux_x86_64.pkg.tar.xz" - wget "https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.0-1-any.pkg.tar.xz" - wget "https://wii.leseratte10.de/devkitPro/file.php/libogc-2.1.0-1-any.pkg.tar.xz" - wget "https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-1-linux.pkg.tar.xz" - wget "https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.2-1-linux.pkg.tar.xz" + wget "https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r39-2-linux_x86_64.pkg.tar.xz" + wget "https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.1-1-any.pkg.tar.xz" + wget "https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz" + wget "https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz" + wget "https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz" cd .. - name: Verify checksums run: | sha256sum -c < /dev/null PATH=$(pwd)/devkitpro/devkitPPC/bin:$PATH DEVKITPPC=$(pwd)/devkitpro/devkitPPC DEVKITPRO=$(pwd)/devkitpro make - name: Package @@ -115,10 +113,10 @@ jobs: - name: Extract downloaded files run: | - tar -xf cache/devkitPPC-r38-1-linux_x86_64.pkg.tar.xz --strip-components=1 - tar -xf cache/devkitppc-rules-1.1.0-1-any.pkg.tar.xz --strip-components=1 - tar -xf cache/general-tools-1.2.0-1-linux.pkg.tar.xz --strip-components=1 - tar -xf cache/gamecube-tools-1.0.2-1-linux.pkg.tar.xz --strip-components=1 + tar -xf cache/devkitPPC-r39-2-linux_x86_64.pkg.tar.xz --strip-components=1 + tar -xf cache/devkitppc-rules-1.1.1-1-any.pkg.tar.xz --strip-components=1 + tar -xf cache/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz --strip-components=1 + tar -xf cache/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz --strip-components=1 - name: Checkout libogc uses: actions/checkout@v2 @@ -130,10 +128,8 @@ jobs: run: PATH=$(pwd)/devkitpro/devkitPPC/bin:$PATH DEVKITPPC=$(pwd)/devkitpro/devkitPPC DEVKITPRO=$(pwd)/devkitpro make install -C libogc - name: Compile USB Loader GX - # version would be 0 unless subversion is removed run: | rm -r libogc - sudo apt-get -qq remove subversion > /dev/null PATH=$(pwd)/devkitpro/devkitPPC/bin:$PATH DEVKITPPC=$(pwd)/devkitpro/devkitPPC DEVKITPRO=$(pwd)/devkitpro make - name: Package diff --git a/Dockerfile b/Dockerfile index 6e77719c..a6929d2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,21 +8,20 @@ FROM debian:buster as usbloader ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London" RUN apt-get update -y && apt-get install -y \ - xz-utils make git && \ - apt-get -qq remove subversion + xz-utils make git -ADD https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r38-1-linux_x86_64.pkg.tar.xz / -ADD https://wii.leseratte10.de/devkitPro/file.php/libogc-2.1.0-1-any.pkg.tar.xz / -ADD https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.0-1-any.pkg.tar.xz / -ADD https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-1-linux.pkg.tar.xz / -ADD https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.2-1-linux.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/devkitPPC-r39-2-linux_x86_64.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/libogc-2.3.1-1-any.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/devkitppc-rules-1.1.1-1-any.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz / +ADD https://wii.leseratte10.de/devkitPro/file.php/gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz / -RUN tar -xf /devkitPPC-r38-1-linux_x86_64.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1 && \ - tar -xf /libogc-2.1.0-1-any.pkg.tar.xz opt/devkitpro/libogc --strip-components=1 && \ - tar -xf /devkitppc-rules-1.1.0-1-any.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1 && \ - tar -C /usr/local/bin -xf /general-tools-1.2.0-1-linux.pkg.tar.xz opt/devkitpro/tools/bin/bin2s --strip-components=4 && \ - tar -C /usr/local/bin -xf /gamecube-tools-1.0.2-1-linux.pkg.tar.xz opt/devkitpro/tools/bin/elf2dol --strip-components=4 && \ +RUN tar -xf /devkitPPC-r39-2-linux_x86_64.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1 && \ + tar -xf /libogc-2.3.1-1-any.pkg.tar.xz opt/devkitpro/libogc --strip-components=1 && \ + tar -xf /devkitppc-rules-1.1.1-1-any.pkg.tar.xz opt/devkitpro/devkitPPC --strip-components=1 && \ + tar -C /usr/local/bin -xf /general-tools-1.2.0-2-linux_x86_64.pkg.tar.xz opt/devkitpro/tools/bin/bin2s --strip-components=4 && \ + tar -C /usr/local/bin -xf /gamecube-tools-1.0.3-1-linux_x86_64.pkg.tar.xz opt/devkitpro/tools/bin/elf2dol --strip-components=4 && \ mkdir /projectroot ENV DEVKITPRO=/devkitpro @@ -37,4 +36,4 @@ RUN cd /projectroot && make # Copy the DOL and ELF out of the container FROM scratch AS export-stage -COPY --from=usbloader /projectroot/boot.* / \ No newline at end of file +COPY --from=usbloader /projectroot/boot.* / diff --git a/svnrev.sh b/svnrev.sh index eb6ef493..d6b64d2e 100644 --- a/svnrev.sh +++ b/svnrev.sh @@ -3,7 +3,7 @@ rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r') [ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r') -[ -z "$rev_new_raw" ] && rev_new_raw=$(cat version.txt) && skip_ver_bump="true" +[ "${#rev_new_raw}" != "5" ] && rev_new_raw=$(cat version.txt) && skip_ver_bump="true" rev_new_raw=$(echo $rev_new_raw | sed 's/[^0-9]*\([0-9]*\)\(.*\)/\1 \2/') rev_new=0 @@ -62,10 +62,10 @@ Features are automatic widescreen detection, coverdownload, parental control, th Credits: Coding: Cyan, Dimok, blackb0x, nIxx, giantpune, ardi, Hungyip84, DrayX7, Lustar, r-win, WiiShizzza -Artworks: cyrex, NeoRame +Artwork: cyrex, NeoRame Validation: Cyan and many others Issue management: Cyan -GameTDB / Hosting covers: Lustar +GameTDB / Covers: Lustar USBLoader sources: Waninkoko, Kwiirk, Hermes cIOS maintenance: davebaol, xabby666, XFlak and Rodries Languages files updates: Kinyo and translaters @@ -73,7 +73,7 @@ Themes website: Larsenv, Wingysam Libwiigui: Tantric Libogc/Devkit: Shagkur and Wintermute -FreeTypeGX: Armin Tamzarian. +FreeTypeGX: Armin Tamzarian USB Loader GX (enhanced): https://github.com/wiidev/usbloadergx