From d5e588432ccbea63c6194bd282cf35c03bc56d12 Mon Sep 17 00:00:00 2001 From: FalsePhilosopher Date: Fri, 5 Dec 2025 10:08:33 -0700 Subject: [PATCH 1/3] Updated the build system --- .github/workflows/6.1.y-baikal.yml | 46 --------------------- .github/workflows/6.12.y.yml | 47 ---------------------- .github/workflows/6.8.y.yml | 47 ---------------------- .github/workflows/{6.1.y.yml => Build.yml} | 30 +++++++++++++- 4 files changed, 28 insertions(+), 142 deletions(-) delete mode 100644 .github/workflows/6.1.y-baikal.yml delete mode 100644 .github/workflows/6.12.y.yml delete mode 100644 .github/workflows/6.8.y.yml rename .github/workflows/{6.1.y.yml => Build.yml} (60%) diff --git a/.github/workflows/6.1.y-baikal.yml b/.github/workflows/6.1.y-baikal.yml deleted file mode 100644 index a14cff38bffb9a..00000000000000 --- a/.github/workflows/6.1.y-baikal.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Build 6.1.y-baikal -on: - workflow_dispatch: - -jobs: - build-kernel: - runs-on: ubuntu-latest - - steps: - - name: Checkout the repository - uses: actions/checkout@v4 - with: - ref: ps4-linux-6.1.y-baikal - submodules: recursive - - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential flex bison libssl-dev libelf-dev bc dwarves clang llvm - - - name: Copy custom config - run: | - cp config .config - - - name: Install WiFi firmware - run: | - mkdir -p lib/firmware/mrvl - cd lib/firmware/mrvl - wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/mrvl/sd8897_uapsta.bin - wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/mrvl/sd8797_uapsta.bin - cd ../../.. - sed -i 's,CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware",CONFIG_EXTRA_FIRMWARE_DIR="lib/firmware",g' .config - - - name: Build kernel - run: | - make -j$(nproc) - - - name: Build bzImage - run: | - make bzImage - - - name: Upload bzImage as an artifact - uses: actions/upload-artifact@v4 - with: - name: bzImage - path: arch/x86/boot/bzImage diff --git a/.github/workflows/6.12.y.yml b/.github/workflows/6.12.y.yml deleted file mode 100644 index b7aadce0f9c4e7..00000000000000 --- a/.github/workflows/6.12.y.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Build 6.12.y - -on: - workflow_dispatch: - -jobs: - build-kernel: - runs-on: ubuntu-latest - - steps: - - name: Checkout the repository - uses: actions/checkout@v4 - with: - ref: ps4-linux-6.12.y - submodules: recursive - - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential flex bison libssl-dev libelf-dev bc dwarves clang llvm - - - name: Copy custom config - run: | - cp config .config - - - name: Install WiFi firmware - run: | - mkdir -p lib/firmware/mrvl - cd lib/firmware/mrvl - wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/mrvl/sd8897_uapsta.bin - wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/mrvl/sd8797_uapsta.bin - cd ../../.. - sed -i 's,CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware",CONFIG_EXTRA_FIRMWARE_DIR="lib/firmware",g' .config - - - name: Build kernel - run: | - make -j$(nproc) - - - name: Build bzImage - run: | - make bzImage - - - name: Upload bzImage as an artifact - uses: actions/upload-artifact@v4 - with: - name: bzImage - path: arch/x86/boot/bzImage diff --git a/.github/workflows/6.8.y.yml b/.github/workflows/6.8.y.yml deleted file mode 100644 index 57a4151cc8ea7e..00000000000000 --- a/.github/workflows/6.8.y.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Build 6.8.y - -on: - workflow_dispatch: - -jobs: - build-kernel: - runs-on: ubuntu-latest - - steps: - - name: Checkout the repository - uses: actions/checkout@v4 - with: - ref: ps4-linux-6.8.y - submodules: recursive - - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y build-essential flex bison libssl-dev libelf-dev bc dwarves clang llvm - - - name: Copy custom config - run: | - cp config .config - - - name: Install WiFi firmware - run: | - mkdir -p lib/firmware/mrvl - cd lib/firmware/mrvl - wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/mrvl/sd8897_uapsta.bin - wget https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/mrvl/sd8797_uapsta.bin - cd ../../.. - sed -i 's,CONFIG_EXTRA_FIRMWARE_DIR="/lib/firmware",CONFIG_EXTRA_FIRMWARE_DIR="lib/firmware",g' .config - - - name: Build kernel - run: | - make -j$(nproc) - - - name: Build bzImage - run: | - make bzImage - - - name: Upload bzImage as an artifact - uses: actions/upload-artifact@v4 - with: - name: bzImage - path: arch/x86/boot/bzImage diff --git a/.github/workflows/6.1.y.yml b/.github/workflows/Build.yml similarity index 60% rename from .github/workflows/6.1.y.yml rename to .github/workflows/Build.yml index d78da0235897ec..4e6f1c3a0a8c1a 100644 --- a/.github/workflows/6.1.y.yml +++ b/.github/workflows/Build.yml @@ -1,7 +1,22 @@ -name: Build 6.1.y +name: Build Kernel on: workflow_dispatch: + inputs: + branch: + description: 'Branch to build' + required: true + default: 'main' + type: string + create_release: + description: 'Create a release?' + required: true + default: false + type: boolean + release_name: + description: 'Release name (optional, defaults to branch name)' + required: false + type: string jobs: build-kernel: @@ -11,7 +26,7 @@ jobs: - name: Checkout the repository uses: actions/checkout@v4 with: - ref: ps4-linux-6.1.y + ref: ${{ inputs.branch }} submodules: recursive - name: Install dependencies @@ -45,3 +60,14 @@ jobs: with: name: bzImage path: arch/x86/boot/bzImage + + - name: Create Release + if: ${{ inputs.create_release }} + uses: softprops/action-gh-release@v2 + with: + tag_name: ${{ inputs.branch }} + name: ${{ inputs.release_name || inputs.branch }} + files: arch/x86/boot/bzImage + generate_release_notes: true + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 3baea03138791a0e70c0ea1e8b5be69aec048d86 Mon Sep 17 00:00:00 2001 From: FalsePhilosopher Date: Fri, 5 Dec 2025 10:23:45 -0700 Subject: [PATCH 2/3] Updated the build system --- .github/workflows/Build.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 4e6f1c3a0a8c1a..31e44dc065a26b 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -5,9 +5,21 @@ on: inputs: branch: description: 'Branch to build' - required: true - default: 'main' - type: string + default: 'ps4-linux-6.15.y' + type: choice + options: + - ps4-linux-6.15.y-baikal + - ps4-linux-6.15.y + - ps4-linux-6.15.y-baikal + - ps4-linux-6.12.y + - ps4-linux-6.9.y + - ps4-linux-6.8.y + - ps4-linux-6.6.y + - ps4-linux-6.1.y + - ps4-linux-5.16.y + - ps4-linux-5.15.y + - linux-5.15.y + - master create_release: description: 'Create a release?' required: true From 9c72066177d1c931331d87ae2b9e23e6f2ebf33f Mon Sep 17 00:00:00 2001 From: FalsePhilosopher <108245223+FalsePhilosopher@users.noreply.github.com> Date: Fri, 5 Dec 2025 10:47:33 -0700 Subject: [PATCH 3/3] Remove duplicate option from Build.yml Removed duplicate option 'ps4-linux-6.15.y-baikal' from choices. --- .github/workflows/Build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 31e44dc065a26b..19946e64ef88eb 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -10,7 +10,6 @@ on: options: - ps4-linux-6.15.y-baikal - ps4-linux-6.15.y - - ps4-linux-6.15.y-baikal - ps4-linux-6.12.y - ps4-linux-6.9.y - ps4-linux-6.8.y