FORCED: Overwriting Tuna with local state

Author: NathanNeurotic

.github/workflows/compile-core.yml

@@ -1,52 +1,123 @@
-name: Build [All]
+name: Build PS2 Exploits Installer
 
 on:
-  workflow_dispatch:
+  workflow_dispatch: # Allows manual triggering
   push:
     paths:
       - 'installer/**'
       - 'installer_res/**'
       - '.github/workflows/compile-core.yml'
   schedule:
-    - cron: "0 15 1 * *"
+    - cron: "0 15 1 * *" # Runs at 3 PM UTC on the 1st of every month
 
 jobs:
   build-packages:
     runs-on: ubuntu-latest
-    container: ps2dev/ps2dev:v1.0
+    container: ps2dev/ps2dev:v1.0 # Uses a Docker container with PS2SDK pre-installed
+    
     steps:
-      - name: Install dependencies
-        run: apk add --no-cache build-base git zip p7zip
+      - name: Install build dependencies
+        run: apk add --no-cache build-base git zip p7zip tar # Added tar for .tar.gz
 
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          fetch-depth: 0 # Fetch all history for changelog generation
 
       - name: Generate build metadata
+        id: metadata
         run: |
           echo "SHA8=${GITHUB_SHA::8}" >> $GITHUB_ENV
+          # BUILD_TS will be YYYY-MM-DD_HH-MM-SS
           echo "BUILD_TS=$(date +'%Y-%m-%d_%H-%M-%S')" >> $GITHUB_ENV
+          # DATE_FLAT will be YYYY-MM-DD, used for the internal folder name by pack.sh
+          echo "DATE_FLAT=$(date +'%Y-%m-%d')" >> $GITHUB_ENV 
+          echo "::set-output name=sha8::${GITHUB_SHA::8}"
+          echo "::set-output name=build_ts::$(date +'%Y-%m-%d_%H-%M-%S')"
+          echo "::set-output name=date_flat::$(date +'%Y-%m-%d')"
 
-      - name: Compile
+      - name: Compile Installer ELFs
+        env:
+          FMCB_INSTALLER_VERSION: ${{ steps.metadata.outputs.sha8 }} # Pass SHA8 as version
         run: |
           cd installer
-          make rebuild FMCB_INSTALLER_VERSION=${{ env.SHA8 }} EE_BIN_DIR=../installer_res/
-          make rebuild FMCB_INSTALLER_VERSION=${{ env.SHA8 }} EE_BIN_DIR=../installer_res/ EXFAT=1
+          echo "Building standard ELF (output to ../installer_res/)..."
+          make rebuild EE_BIN_DIR=../installer_res/
+          echo "Building exFAT ELF (output to ../installer_res/)..."
+          make rebuild EE_BIN_DIR=../installer_res/ EXFAT=1
+          cd ..
 
-      - name: Prepare folder for Release
+      - name: Run pack.sh to create initial archives
+        env:
+          SHA8: ${{ steps.metadata.outputs.sha8 }} # Pass SHA8 to pack.sh for commit.txt
         run: |
           cd installer_res
           chmod +x ./pack.sh
-          ./pack.sh
-          mkdir -p ../release_artifacts
-          mv ../FMCB-1966.7z ../release_artifacts/OSDMenu-Installer-${{ env.BUILD_TS }}.7z
+          ./pack.sh # This script creates archives like ../FMCB-1966.7z
+          cd .. 
+          # The primary output we care about is FMCB-1966.7z, created in project root by pack.sh
 
-      - name: Upload artifact
+      - name: Prepare and Repackage Release
+        id: repackage
+        run: |
+          INITIAL_ARCHIVE_NAME="FMCB-1966.7z" # This is what pack.sh creates in project root for the main package
+          TEMP_EXTRACT_DIR="temp_extract_for_repack"
+          FINAL_CONTENT_DIR_BASENAME="OSDMenu-Installer" # pack.sh creates this folder name base for the 1966 version
+          FINAL_CONTENT_DIR="${FINAL_CONTENT_DIR_BASENAME}-${{ steps.metadata.outputs.date_flat }}" # e.g., OSDMenu-Installer-2025-05-09
+          
+          RELEASE_ARTIFACTS_DIR="release_artifacts"
+          mkdir -p ${RELEASE_ARTIFACTS_DIR}
+          
+          echo "Initial archive from pack.sh: ${INITIAL_ARCHIVE_NAME}"
+          if [ ! -f "${INITIAL_ARCHIVE_NAME}" ]; then
+            echo "Error: ${INITIAL_ARCHIVE_NAME} not found after pack.sh execution!"
+            exit 1
+          fi
+
+          echo "Creating temporary extraction directory: ${TEMP_EXTRACT_DIR}"
+          mkdir -p ${TEMP_EXTRACT_DIR}
+          cd ${TEMP_EXTRACT_DIR}
+          
+          echo "Extracting ${INITIAL_ARCHIVE_NAME}..."
+          7z x ../${INITIAL_ARCHIVE_NAME}
+          
+          if [ ! -d "${FINAL_CONTENT_DIR}" ]; then
+            echo "Error: Expected directory ${FINAL_CONTENT_DIR} not found after extraction!"
+            ls -la # List contents for debugging
+            exit 1
+          fi
+          
+          echo "Changing to content directory: ${FINAL_CONTENT_DIR}"
+          cd "${FINAL_CONTENT_DIR}"
+          
+          # Define new base name for repackaged archives
+          REPACK_BASE_NAME="PS2-Exploits-Installer-${{ steps.metadata.outputs.build_ts }}"
+          
+          echo "Creating .zip archive: ../../${RELEASE_ARTIFACTS_DIR}/${REPACK_BASE_NAME}.zip"
+          zip -r9 ../../${RELEASE_ARTIFACTS_DIR}/${REPACK_BASE_NAME}.zip .
+          
+          echo "Creating .7z archive: ../../${RELEASE_ARTIFACTS_DIR}/${REPACK_BASE_NAME}.7z"
+          7z a -t7z -mx=9 ../../${RELEASE_ARTIFACTS_DIR}/${REPACK_BASE_NAME}.7z .
+          
+          echo "Creating .tar.gz archive: ../../${RELEASE_ARTIFACTS_DIR}/${REPACK_BASE_NAME}.tar.gz"
+          tar -czvf ../../${RELEASE_ARTIFACTS_DIR}/${REPACK_BASE_NAME}.tar.gz .
+          
+          cd ../../ # Back to project root
+          rm -rf ${TEMP_EXTRACT_DIR} # Clean up temporary directory
+          
+          echo "Repackaging complete. New archives are in ${RELEASE_ARTIFACTS_DIR}/"
+          ls -la ${RELEASE_ARTIFACTS_DIR}/
+
+      - name: Upload Repackaged Artifacts
         if: success()
         uses: actions/upload-artifact@v4
         with:
-          name: FMCB-${{ env.SHA8 }}
-          path: release_artifacts/OSDMenu-Installer-${{ env.BUILD_TS }}.7z
+          name: PS2-Exploits-Installer-${{ steps.metadata.outputs.sha8 }}
+          path: |
+            release_artifacts/PS2-Exploits-Installer-${{ steps.metadata.outputs.build_ts }}.zip
+            release_artifacts/PS2-Exploits-Installer-${{ steps.metadata.outputs.build_ts }}.7z
+            release_artifacts/PS2-Exploits-Installer-${{ steps.metadata.outputs.build_ts }}.tar.gz
+          retention-days: 7
 
       - name: Generate changelog since last tag
         id: changelog
@@ -61,20 +132,30 @@ jobs:
           else
             LOG_BODY="$(git log --pretty=format:"- %s (%h) by %an")"
           fi
+          
+          # Escape special characters for multiline JSON string
+          LOG_BODY="${LOG_BODY//'%'/'%25'}"
+          LOG_BODY="${LOG_BODY//$'\n'/'%0A'}"
+          LOG_BODY="${LOG_BODY//$'\r'/'%0D'}"
 
-          echo 'RELEASE_BODY<<EOF' >> $GITHUB_ENV
-          echo "$LOG_BODY" >> $GITHUB_ENV
-          echo 'EOF' >> $GITHUB_ENV
+          echo "::set-output name=body::$LOG_BODY"
 
-      - name: Create release
-        uses: marvinpinto/action-automatic-releases@latest
+      - name: Create GitHub Release
+        if: success() # Only run if previous steps were successful
+        uses: marvinpinto/action-automatic-releases@latest # Or your preferred release action
         with:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "OSDMenu"
+          automatic_release_tag: "Tuna-v${{ steps.metadata.outputs.build_ts }}" # Use a dynamic tag like Tuna-vYYYY-MM-DD_HH-MM-SS
           prerelease: true
-          title: "OSDMenu Installer"
+          title: "PS2 Exploits Installer (Build ${{ steps.metadata.outputs.build_ts }})"
           files: |
-            release_artifacts/OSDMenu-Installer-${{ env.BUILD_TS }}.7z
+            release_artifacts/PS2-Exploits-Installer-${{ steps.metadata.outputs.build_ts }}.zip
+            release_artifacts/PS2-Exploits-Installer-${{ steps.metadata.outputs.build_ts }}.7z
+            release_artifacts/PS2-Exploits-Installer-${{ steps.metadata.outputs.build_ts }}.tar.gz
           body: |
+            Automated pre-release build.
+            Commit: ${{ steps.metadata.outputs.sha8 }}
+            Build Timestamp: ${{ steps.metadata.outputs.build_ts }}
+
             ### Recent Changes:
-            ${{ env.RELEASE_BODY }}
+            ${{ steps.changelog.outputs.body }}

installer/Makefile

@@ -1,20 +1,23 @@
 # Makefile for the FreeMcBoot Installer EE (Emotion Engine) application
 
 # Target ELF name parts
-EE_BIN_DIR = ./
+# EE_BIN_DIR is the output directory for the ELFs.
+# It's defined as './' here for local builds.
+# The GitHub Actions workflow (compile-core.yml) overrides this to EE_BIN_DIR=../installer_res/
+EE_BIN_DIR = ./ 
 EE_BIN_BASE_NAME = UNC_FMCBInstaller
 EE_BIN_PACKED_BASE_NAME = FMCBInstaller
 
-# exFAT support option (0 = no, 1 = yes)
-EXFAT ?= 0 # Default to 0 if not set externally
+# exFAT support option (0 = no, 1 = yes) - Can be overridden from command line, e.g., make EXFAT=1
+EXFAT ?= 0 # Default to 0 (no exFAT support) if not set externally
 
 # Determine suffix based on EXFAT option
 HAS_EXFAT =
 ifeq ($(EXFAT), 1)
     HAS_EXFAT = _EXFAT
 endif
 
-# Final ELF names
+# Final ELF names. These will be placed in EE_BIN_DIR.
 EE_BIN = $(EE_BIN_DIR)$(EE_BIN_BASE_NAME)$(HAS_EXFAT).elf
 EE_BIN_PACKED = $(EE_BIN_DIR)$(EE_BIN_PACKED_BASE_NAME)$(HAS_EXFAT).elf
 
@@ -36,12 +39,12 @@ EE_OBJS = main.o iop.o UI.o menu.o libsecr.o pad.o system.o graphics.o ReqSpaceC
           $(EE_RES_OBJS) $(EE_IOP_OBJS) mctools_rpc.o
 
 # Include paths for EE compilation
-EE_INCS := -I$(PS2SDK)/ports/include \
+EE_INCS := -I. \
+           -I$(PS2SDK)/ports/include \
            -I$(PS2SDK)/ee/include \
            -I$(PS2SDK)/common/include \
            -I./irx/source/secrsif/src \
-           -I./irx/source/mctools/src/ \
-           -I. # Add current directory for project headers like main.h, UI.h etc.
+           -I./irx/source/mctools/src/
 
 # Linker flags for EE
 EE_LDFLAGS := -L$(PS2SDK)/ports/lib \
@@ -58,7 +61,8 @@ EE_GPVAL = -G8192
 
 # CFLAGS for EE compilation
 # -Os for size optimization, -mgpopt for GP optimization
-EE_CFLAGS += -Os -mgpopt $(EE_GPVAL)
+# Added -Wall for all warnings, -Wno-string-plus-int to suppress a common GCCism warning
+EE_CFLAGS += -Os -mgpopt $(EE_GPVAL) -Wall -Wno-string-plus-int
 
 # Conditional compilation for exFAT support
 ifeq ($(EXFAT), 1)
@@ -78,7 +82,7 @@ ifdef FMCB_INSTALLER_VERSION
     EE_CFLAGS += -DFMCB_INSTALLER_VERSION=\"$(FMCB_INSTALLER_VERSION)\"
 endif
 
-# Default rule to build all
+# Default rule to build all (now defaults to the packed version)
 all: $(EE_BIN_PACKED)
 
 # Rule to compile .c files to .o
@@ -94,22 +98,26 @@ all: $(EE_BIN_PACKED)
 	$(EE_AS) $(EE_ASFLAGS) $< -o $@
 
 # Rule to link EE objects into the final ELF
-$(EE_BIN) : $(EE_OBJS) $(PS2SDK)/ee/startup/crt0.o
-	$(EE_CC) $(EE_CFLAGS) -nostartfiles $(EE_LDFLAGS) -o $(EE_BIN) $(EE_OBJS) $(PS2SDK)/ee/startup/crt0.o $(EE_LIBS)
+# Standard order: crt0.o, then your objects, then libraries.
+$(EE_BIN) : $(PS2SDK)/ee/startup/crt0.o $(EE_OBJS)
+	$(EE_CC) $(EE_CFLAGS) -nostartfiles $(EE_LDFLAGS) -o $(EE_BIN) $(PS2SDK)/ee/startup/crt0.o $(EE_OBJS) $(EE_LIBS)
 
 # Rule to pack the ELF using ps2-packer
 $(EE_BIN_PACKED): $(EE_BIN)
-	@echo " -- Compressing ELF --"
+	@echo " -- Compressing ELF $(EE_BIN) -> $(EE_BIN_PACKED) --"
 	ps2-packer -v $< $@
 
 # Rule to clean compiled files
 clean:
 	@echo " -- Cleaning compiled files --"
 	rm -f $(EE_BIN) $(EE_BIN_PACKED) $(EE_OBJS) \
-	      *_irx.c background.c buttons.c IOPRP_img.c \
-	      usbmass_bd_irx.c bdm_irx.c bdmfs_fatfs_irx.c # Clean exFAT specific generated files too
+	      IOPRP_img.c IOMANX_irx.c FILEXIO_irx.c SIO2MAN_irx.c PADMAN_irx.c MCMAN_irx.c \
+	      MCSERV_irx.c SECRSIF_irx.c MCTOOLS_irx.c USBD_irx.c POWEROFF_irx.c DEV9_irx.c \
+	      ATAD_irx.c HDD_irx.c PFS_irx.c \
+	      background.c buttons.c \
+	      usbmass_bd_irx.c bdm_irx.c bdmfs_fatfs_irx.c USBHDFSD_irx.c # Clean all possible generated .c files
 
-# Rule to rebuild (clean then build)
+# Rule to rebuild (clean then build all)
 rebuild: clean all
 
 # Rules for converting binary resources/IRXs to C arrays using bin2c
@@ -152,10 +160,10 @@ USBD_irx.c: $(PS2SDK)/iop/irx/usbd.irx
 ATAD_irx.c: $(PS2SDK)/iop/irx/ps2atad.irx
 	bin2c $< $@ ATAD_irx
 
-HDD_irx.c: $(PS2SDK)/iop/irx/ps2hdd-osd.irx # Or ps2hdd.irx depending on SDK version/config
+HDD_irx.c: $(PS2SDK)/iop/irx/ps2hdd-osd.irx 
 	bin2c $< $@ HDD_irx
 
-PFS_irx.c: $(PS2SDK)/iop/irx/ps2fs.irx # Or pfsaux.irx / pfs.irx depending on SDK
+PFS_irx.c: $(PS2SDK)/iop/irx/ps2fs.irx 
 	bin2c $< $@ PFS_irx
 
 # Custom/Project-specific IRXs (from IRX_DIR)
@@ -165,7 +173,7 @@ SECRSIF_irx.c: $(IRX_DIR)/secrsif.irx
 MCTOOLS_irx.c: $(IRX_DIR)/mctools.irx
 	bin2c $< $@ MCTOOLS_irx
 
-IOPRP_img.c: $(IRX_DIR)/IOPRP.img # This is an IOP Reset Program image
+IOPRP_img.c: $(IRX_DIR)/IOPRP.img 
 	bin2c $< $@ IOPRP_img
 
 # Conditional IRX to C conversion based on EXFAT support