Try to support multiple firmware

Author: SoftwareRat

.github/workflows/ci.yaml

@@ -7,6 +7,8 @@ on:
     paths:
       - '.github/workflows/ci.yaml'
       - 'custom/**'
+      - 'stage1/**'
+      - 'stage2/**'
 
 permissions:
   contents: write
@@ -18,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        architecture: [x86_64, aarch64]
+        firmware: [900, 903, 950, 1000, 1001, 1050, 1070, 1100]
 
     steps:
       - name: Checkout repository
@@ -29,7 +31,7 @@ jobs:
       - name: Set up Alpine Linux environment
         uses: jirutka/[email protected]
         with:
-          arch: ${{ matrix.architecture }}
+          arch: x86_64
           branch: latest-stable
           packages: |
             alpine-sdk
@@ -50,72 +52,94 @@ jobs:
             7zip
             curl
             jq
+            build-base
+            gcc
+            musl-dev
+            make
           shell-name: alpine
 
+      - name: Build stage1 and stage2 for FW ${{ matrix.firmware }}
+        shell: alpine --root {0}
+        env:
+          FW: ${{ matrix.firmware }}
+        run: |
+          set -e
+          echo "Building stage1 and stage2 for FW ${FW}..."
+          
+          # Build stage1
+          echo "Building stage1 FW=${FW}"
+          make -C stage1 FW=${FW} clean
+          make -C stage1 FW=${FW}
+          
+          # Build stage2
+          echo "Building stage2 FW=${FW}"
+          make -C stage2 FW=${FW} clean
+          make -C stage2 FW=${FW}
+
       - name: Prepare PPPwn binaries
         shell: alpine --root {0}
         env:
-          ARCH: ${{ matrix.architecture }}
+          FW: ${{ matrix.firmware }}
         run: |
           set -e
-          echo "Preparing PPPwn binaries for ${ARCH}..."
+          echo "Preparing PPPwn binaries for FW ${FW}..."
           mkdir -p /tmp/pppwnlive
           cd /tmp/pppwnlive
 
-          # Download and extract binaries with retries
+          # Download and extract PPPwn binary
           for attempt in {1..3}; do
-            wget https://github.com/xfangfang/PPPwn_cpp/releases/latest/download/${ARCH}-linux-musl.zip && break || sleep 5
+            wget https://github.com/xfangfang/PPPwn_cpp/releases/latest/download/x86_64-linux-musl.zip && break || sleep 5
           done
-          unzip -p ${ARCH}-linux-musl.zip | tar -xzOf - pppwn > pppwn && rm ${ARCH}-linux-musl.zip
-
-          wget https://github.com/B-Dem/PPPwnUI/raw/main/PPPwn/goldhen/1100/stage1.bin
-          curl -L -o GoldHEN.7z $(curl -s https://api.github.com/repos/GoldHEN/GoldHEN/releases | jq -r '.[0].assets[0].browser_download_url')
-          7zz e GoldHEN.7z pppnw_stage2/stage2_v*.7z -r -aoa
-          7zz e stage2_v*.7z stage2_11.00.bin -r -aoa
-          mv stage2_11.00.bin stage2.bin
-          rm GoldHEN.7z stage2_v*.7z
+          unzip -p x86_64-linux-musl.zip | tar -xzOf - pppwn > pppwn && rm x86_64-linux-musl.zip
+
+          # Copy compiled stage1 and stage2 binaries
+          cp /github/workspace/stage1/stage1_${FW}.bin stage1.bin || cp /github/workspace/stage1/build/stage1_${FW}.bin stage1.bin
+          cp /github/workspace/stage2/stage2_${FW}.bin stage2.bin || cp /github/workspace/stage2/build/stage2_${FW}.bin stage2.bin
+          
           cd /tmp
           tar -czf pppwn.tar.gz pppwnlive/*
 
       - name: Install required packages and setup environment
         shell: alpine --root {0}
         env:
-          ARCH: ${{ matrix.architecture }}
+          FW: ${{ matrix.firmware }}
         run: |
           set -e
-          echo "Installing required packages and setting up environment for ${ARCH}..."
+          echo "Installing required packages and setting up environment for FW ${FW}..."
           find /tmp -name "pppwn.tar.gz" -exec cp {} aports/scripts/pppwn.tar.gz \;
           echo "permit nopass root" > /etc/doas.conf
           abuild-keygen -i -a -n -q
 
           echo "http://dl-2.alpinelinux.org/alpine/latest-stable/main" > /etc/apk/repositories
           for i in {1..3}; do apk update && break || sleep 5; done
-          mkdir -p ~/tmp ~/work/iso/${ARCH}
+          mkdir -p ~/tmp ~/work/iso/${FW}
           export TMPDIR=~/tmp
           cp -rf custom/* aports/scripts/
           chmod +x aports/scripts/*
 
       - name: Build ISO
         shell: alpine --root {0}
         env:
-          ARCH: ${{ matrix.architecture }}
+          FW: ${{ matrix.firmware }}
         run: |
           set -e
-          echo "Building ISO for ${ARCH}..."
-          sh aports/scripts/mkimage.sh --tag stable --outdir ~/work/iso/${ARCH} --arch ${ARCH} --repository https://dl-cdn.alpinelinux.org/alpine/latest-stable/main --profile pppwn > /var/log/mkimage.log 2>&1 \
+          echo "Building ISO for FW ${FW}..."
+          sh aports/scripts/mkimage.sh --tag stable --outdir ~/work/iso/${FW} --arch x86_64 --repository https://dl-cdn.alpinelinux.org/alpine/latest-stable/main --profile pppwn > /var/log/mkimage.log \
           || (cat /var/log/mkimage.log || echo "No log found"; exit 1)
-          ISO_PATH=$(find ~/work/iso/${ARCH} -name "alpine-*.iso" -print -quit)
+          ISO_PATH=$(find ~/work/iso/${FW} -name "alpine-*.iso" -print -quit)
           if [ -z "$ISO_PATH" ]; then
             echo "ISO not found!"
             exit 1
           fi
-          mv "$ISO_PATH" ~/work/iso/${ARCH}/pppwn-live-${ARCH}.iso
+          # Convert firmware number to version format for filename (e.g., 1100 -> 11.00)
+          FW_VERSION=$(echo ${FW} | sed 's/\(..\)\(..\)/\1.\2/' | sed 's/^0//')
+          mv "$ISO_PATH" ~/work/iso/${FW}/pppwn-live-x86_64-fw${FW_VERSION}.iso
 
       - name: Upload ISO artifact
         uses: actions/upload-artifact@v4
         with:
-          name: pppwn-live-${{ matrix.architecture }}-iso
-          path: ~/work/iso/${{ matrix.architecture }}/*.iso
+          name: pppwn-live-x86_64-fw${{ matrix.firmware }}-iso
+          path: ~/work/iso/${{ matrix.firmware }}/*.iso
 
   create_release:
     if: github.ref == 'refs/heads/main'
@@ -127,30 +151,35 @@ jobs:
         with:
           path: iso_images
 
-      - name: Calculate SHA256 hashes
-        id: sha256
+      - name: Calculate SHA256 hashes and prepare release body
+        id: prepare_release
         run: |
-          echo "Calculating SHA256 checksums for each architecture..."
-          SHA256_X86=$(sha256sum ./iso_images/pppwn-live-x86_64-iso/pppwn-live-x86_64.iso | awk '{print $1}')
-          SHA256_AARCH64=$(sha256sum ./iso_images/pppwn-live-aarch64-iso/pppwn-live-aarch64.iso | awk '{print $1}')
-          echo "sha256_x86=$SHA256_X86" >> $GITHUB_OUTPUT
-          echo "sha256_aarch64=$SHA256_AARCH64" >> $GITHUB_OUTPUT
+          echo "Calculating SHA256 checksums for each firmware..."
+          {
+            echo "Changelog:"
+            echo "  ${{ github.event.head_commit.message }}"
+            echo ""
+            echo "SHA256 Checksums:"
+          } > release_body.txt
+          
+          for FW in 900 903 950 1000 1001 1050 1070 1100; do
+            # Convert firmware number to version format (e.g., 1100 -> 11.00)
+            FW_VERSION=$(echo $FW | sed 's/\(..\)\(..\)/\1.\2/' | sed 's/^0//')
+            ISO_DIR="./iso_images/pppwn-live-x86_64-fw${FW}-iso"
+            ISO_FILE="${ISO_DIR}/pppwn-live-x86_64-fw${FW_VERSION}.iso"
+            if [ -f "$ISO_FILE" ]; then
+              SUM=$(sha256sum "$ISO_FILE" | awk '{print $1}')
+              echo "  - x86_64 FW${FW_VERSION}: \`$SUM\`" >> release_body.txt
+            fi
+          done
 
       - name: Create Release
         uses: softprops/action-gh-release@v2
         with:
           tag_name: v${{ github.run_number }}
           name: Release v${{ github.run_number }}
-          body: |
-
-            Changelog:
-              ${{ github.event.head_commit.message }}
-
-            SHA256 Checksums:
-              - x86_64: `${{ steps.sha256.outputs.sha256_x86 }}`
-              - aarch64: `${{ steps.sha256.outputs.sha256_aarch64 }}`
+          body_path: release_body.txt
           files: |
-            ./iso_images/pppwn-live-x86_64-iso/pppwn-live-x86_64.iso
-            ./iso_images/pppwn-live-aarch64-iso/pppwn-live-aarch64.iso
+            ./iso_images/pppwn-live-x86_64-fw*-iso/pppwn-live-x86_64-fw*.iso
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -24,4 +24,8 @@ Temporary Items
 
 # ISO image files
 *.iso
-*.img
+*.img
+
+# TEMP: Ignore buildroot
+buildroot-2025.05.tar.gz
+buildroot-2025.05/