FunTuna 2.0.0

.github/workflows/Update-uLaunchELF.yml

@@ -1,6 +1,7 @@
 name: Update uLaunchELF
 
 on:
+  workflow_dispatch:
   repository_dispatch:
     types: [Component_update]
 
@@ -17,8 +18,8 @@ jobs:
 
     - name: Update wLaunchELF_ISR
       run: |
-         wget https://github.com/israpps/wLaunchELF_ISR/releases/download/latest/BOOT.ELF -O __Binaries/ULE.ELF
-         wget https://github.com/israpps/wLaunchELF_ISR/releases/download/latest/BOOT.ELF -O __Release/ULE_psu.ELF
+         wget https://github.com/israpps/wLaunchELF_ISR/releases/download/latest/BOOT-NO_NETWORK.ELF -O installer/INSTALLER_CONTENTS/BOOT/ULE.ELF
+         wget https://github.com/israpps/wLaunchELF_ISR/releases/download/latest/BOOT-NO_NETWORK.ELF -O __Release/ULE_psu.ELF
 
     - uses: EndBug/add-and-commit@v7
       with:

.github/workflows/repack-and-release.yml

@@ -1,35 +1,113 @@
 name: Release Funtuna
 on:
   workflow_dispatch:
-  pull_request:
+#  pull_request:
   repository_dispatch:
     types: [Component_update]
   push:
     paths:
       - '__Release/**'
       - 'installer/**'
+      - 'FreeMcBoot-Configurator/**'
+      - 'FreeMcBoot/**'
       - '.github/workflows/repack-and-release.yml'
 
 #  schedule:
 #   - cron: "0 15 * * 2,5"
 jobs:
+  Build-FreeMcBoot-and-Configurator:
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev:latest
+    steps:
+
+    - name: Install dependencies
+      run: |
+        apk add build-base git
+
+    - name: checkout code for release
+      uses: actions/checkout@v1
+
+    - name: build FreeMcBoot
+      run: |
+        cd FreeMcBoot
+        make
+        cp BOOT.ELF ../BOOT.ELF
+
+    - name: build FreeMcBoot Configurator
+      run: |
+        cd FreeMcBoot-Configurator
+        make
+        cp CFG.ELF ../CFG.ELF
+
+    - name: Copy drivers
+      run: |
+#        cp $PS2SDK/iop/irx/fileXio.irx ./FILEXIO.IRX
+#        cp $PS2SDK/iop/irx/usbd.irx ./USBD.IRX
+#        cp $PS2SDK/iop/irx/usbhdfsd.irx ./USBHDFSD.IRX
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: ELFS
+        path: |
+            CFG.ELF
+            BOOT.ELF
+            FreeMcBoot/BOOT-UNC.ELF
+            FreeMcBoot/BOOT-STRIPPED.ELF
+
   Repack_and_Release:
     runs-on: ubuntu-latest
+    needs: Build-FreeMcBoot-and-Configurator
     container: ps2dev/ps2dev:v1.2.0
     steps:
-    
+
     - name: Install dependencies
       run: |
         apk add build-base git zip p7zip
 
     - name: checkout code for release
       uses: actions/checkout@v1
-
+
+    - name: Get short SHA
+      id: slug
+      run: echo "::set-output name=sha8::$(echo ${GITHUB_SHA} | cut -c1-8)"
+
+
+    - name: Download FreeMcBoot-and-Configurator artifacts
+      uses: actions/download-artifact@v1
+      with:
+        name: ELFS
+
     - name: Update wLaunchELF_ISR
       run: |
-         wget https://github.com/israpps/wLaunchELF_ISR/releases/download/latest/BOOT.ELF -O installer/INSTALLER_CONTENTS/BOOT/ULE.ELF
-         wget https://github.com/israpps/wLaunchELF_ISR/releases/download/latest/BOOT.ELF -O __Release/ULE_psu.ELF
-
+         wget https://github.com/israpps/wLaunchELF_ISR/releases/download/latest/BOOT-NO_NETWORK.ELF -O ULE.ELF
+         cp ULE.ELF installer/INSTALLER_CONTENTS/BOOT/ULE.ELF
+         mv ULE.ELF __Release/ULE_psu.ELF
+
+    - name: Load new FMCB and configurator binaries
+      run: |
+        cp ELFS/BOOT.ELF installer/INSTALLER_CONTENTS/BOOT/BOOT.ELF
+        cp ELFS/CFG.ELF installer/INSTALLER_CONTENTS/BOOT/CFG.ELF
+#        cp ELFS/FILEXIO.IRX installer/INSTALLER_CONTENTS/BOOT/FILEXIO.IRX
+#        cp ELFS/USBD.IRX installer/INSTALLER_CONTENTS/BOOT/USBD.IRX
+#        cp ELFS/USBHDFSD.IRX installer/INSTALLER_CONTENTS/BOOT/USBHDFSD.IRX
+
+    - name: add comment on main CNF with commit hash
+      run: |
+        SCH=${GITHUB_SHA::7}
+        DATEE=`date '+[%Y-%m-%d]'`
+        REPO=${GITHUB_REPOSITORY}
+        cd installer
+        cd INSTALLER_CONTENTS
+        cd BOOT
+        mv FUNTUNA.CNF FUNTUNA.TMP
+        echo "#FunTuna Fork configuration file - commit: $SCH - compiled on $DATEE" > FUNTUNA.CNF
+        echo "#Compiled on GitHub Actions by runner: $REPO" >> FUNTUNA.CNF
+        echo "#FunTuna Fork configuration file - commit: $SCH - compiled on $DATEE"
+        echo "#Compiled on GitHub Actions by runner: $REPO"
+        cat FUNTUNA.TMP >> FUNTUNA.CNF
+        rm FUNTUNA.TMP
+
     - name: build installer
       run: |
         cd installer
@@ -52,17 +130,22 @@ jobs:
         TARGET=FunTuna\[$SCH\].7z
         echo TARGET is $TARGET
         7z a -t7z -r $TARGET *
-        ls -R 
+        ls -R
+
+    - name: Extract branch name
+#      shell: bash
+      run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
+      id: extract_branch
 
     - name: Upload artifacts
       if: ${{ success() }}
       uses: actions/upload-artifact@v2
       with:
-        name: FunTuna
+        name: FunTuna-${{ steps.extract_branch.outputs.branch }}-${{ steps.slug.outputs.sha8 }}
         path: |
              __Release/*.7z
              installer/FunTuna-Fork_Installer.ELF
- 
+
     - name: Create release
       if: github.ref == 'refs/heads/main'
       uses: marvinpinto/action-automatic-releases@latest

.gitignore

@@ -3,6 +3,8 @@ __Experimental/**/desktop.ini
 __STABLE/**/desktop.ini
 **/desktop.ini
 
+**_irx.c
+
 FreeMcBoot/launcher2.elf.BAK
 **.lnk
 
@@ -16,3 +18,13 @@ installer/stripped.elf
 !**dma_asm.S
 !**gs_asm.S
 !**ps2_asm.S
+FreeMcBoot-Configurator/nul
+FreeMcBoot/poweroff_irx.s
+FreeMcBoot/init/init.irx
+FreeMcBoot/init.s
+FreeMcBoot/init.irx
+FreeMcBoot/elf_loader.s
+FreeMcBoot/chkesr/chkesr.irx
+FreeMcBoot/chkesr.s
+FreeMcBoot/chkesr.irx
+.vscode/*