Rel 24.08.00.01

.github/workflows/build.yml

@@ -0,0 +1,129 @@
+name: Dasharo
+on:
+  push:
+    branches:
+      - rel_*
+
+jobs:
+  build_pcengines:
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/dasharo/dasharo-sdk:v1.6.0-rc4
+      options: --user 1001
+    strategy:
+      matrix:
+        vendor: [ pcengines ]
+        model: [ apu2, apu3, apu4, apu6 ]
+        payload: [ seabios ]
+    steps:
+      - name: Checkout coreboot
+        run: |
+          echo "VERSION=$(echo ${GITHUB_REF#refs/heads/rel_} | tr '/' '_')" >> $GITHUB_ENV
+          VERSION=$(echo ${GITHUB_REF#refs/heads/rel_} | tr '/' '_')
+          CORELABEL=$(echo $VERSION | awk -F '.' '{if ($3 == "00") print $1"."$2; else print $1"."$2"."$3}')
+          echo "Extracted Coreboot version: $CORELABEL"
+          git clone https://review.coreboot.org/coreboot
+          cd coreboot
+          git checkout $CORELABEL -b patchqueue
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          # Checkout pull request HEAD commit instead of merge commit
+          # See: https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit
+          ref: ${{ github.event.pull_request.head.sha }}
+          # Fetch complete history
+          fetch-depth: 0
+          path: coreboot/.git/patches
+      - name: Set Up Git
+        run: |
+          cd $GITHUB_WORKSPACE/coreboot
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          ln -s patches .git/patches/patchqueue
+          touch .git/patches/patchqueue/status
+      - name: Apply Patches Using Guilt
+        run: |
+          cd $GITHUB_WORKSPACE/coreboot
+          guilt push -a
+      - name: Checkout coreboot submodules and add annoted tag
+        run: |
+          cd $GITHUB_WORKSPACE/coreboot
+          git submodule update --init --recursive --checkout
+          # this is for verification of reproducibility in local builds
+          git tag -a github-actions-bot-tag -m "$GITHUB_REF_NAME"
+      - name: Build Dasharo
+        run: |
+          cd $GITHUB_WORKSPACE/coreboot
+          cp configs/config.${{ matrix.vendor }}_${{ matrix.payload }}_${{ matrix.model }} .config
+          make olddefconfig
+          make BUILD_TIMELESS=1
+      - name: Save artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: "dasharo-${{ matrix.vendor }}-${{ matrix.model }}-${{ matrix.payload }}"
+          path: |
+            coreboot/build/coreboot.rom
+          retention-days: 30
+  build_q35:
+    runs-on: ubuntu-22.04
+    container:
+      image: ghcr.io/dasharo/dasharo-sdk:v1.6.0-rc4
+      options: --user 1001
+    strategy:
+      matrix:
+        vendor: [ emulation_qemu ]
+        model: [ x86_q35 ]
+        payload: [ smm_tseg_seabios ]
+    steps:
+      - name: Checkout coreboot
+        run: |
+          echo "VERSION=$(echo ${GITHUB_REF#refs/heads/rel_} | tr '/' '_')" >> $GITHUB_ENV
+          VERSION=$(echo ${GITHUB_REF#refs/heads/rel_} | tr '/' '_')
+          CORELABEL=$(echo $VERSION | awk -F '.' '{if ($3 == "00") print $1"."$2; else print $1"."$2"."$3}')
+          echo "Extracted Coreboot version: $CORELABEL"
+          git clone https://review.coreboot.org/coreboot
+          cd coreboot
+          git checkout $CORELABEL -b patchqueue
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          # Checkout pull request HEAD commit instead of merge commit
+          # See: https://github.com/actions/checkout#checkout-pull-request-head-commit-instead-of-merge-commit
+          ref: ${{ github.event.pull_request.head.sha }}
+          # Fetch complete history
+          fetch-depth: 0
+          path: coreboot/.git/patches
+      - name: Set Up Git
+        run: |
+          cd $GITHUB_WORKSPACE/coreboot
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          ln -s patches .git/patches/patchqueue
+          touch .git/patches/patchqueue/status
+      - name: Apply Patches Using Guilt
+        run: |
+          cd $GITHUB_WORKSPACE/coreboot
+          guilt push -a
+      - name: Checkout coreboot submodules and add annoted tag
+        run: |
+          cd $GITHUB_WORKSPACE/coreboot
+          git submodule update --init --recursive --checkout
+          # this is for verification of reproducibility in local builds
+          git tag -a github-actions-bot-tag -m "$GITHUB_REF_NAME"
+      - name: Build Dasharo
+        run: |
+          cd $GITHUB_WORKSPACE/coreboot
+          cp configs/config.${{ matrix.vendor }}_${{ matrix.model }}_${{ matrix.payload }} .config
+          make olddefconfig
+          make BUILD_TIMELESS=1
+          mv build/coreboot.rom build/qemu_q35_${VERSION}.rom
+          sha256sum build/qemu_q35_${VERSION}.rom > build/qemu_q35_${VERSION}.rom.sha256
+      - name: Save artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: "dasharo-${{ matrix.vendor }}-${{ matrix.model }}-${{ matrix.payload }}_${{ env.VERSION }}"
+          path: |
+            coreboot/build/qemu_q35_${{ env.VERSION }}.rom
+            coreboot/build/qemu_q35_${{ env.VERSION }}.rom.sha256
+          retention-days: 30
+

.gitignore

@@ -0,0 +1,3 @@
+*.*~
+patches/status
+patchqueue

README.md

@@ -10,9 +10,9 @@ information on contributing to the Dasharo project.
 
 ## Usage
 
-Following procedure was created while testing PC Engines v24.05.00.01. It
-should be generalized after gaining better understanding of the Dasharo
-Patchqueue Initiative.
+Following procedure was created while testing PC Engines v24.05.00.01 and
+retested while releasing v24.08.00.01. It should be generalized after gaining
+better understanding of the Dasharo Patchqueue Initiative.
 
 ### Prepare code base
 
@@ -29,7 +29,7 @@ cd coreboot
 Checkout branch on tag on which you would like to apply patchqueue:
 
 ```bash
-git checkout 24.05 -b patchqueue
+git checkout 24.08 -b patchqueue
 ```
 
 Clone this repo:
@@ -44,10 +44,11 @@ Go to `.git/patches` and checkout correct patchqueue version:
 cd .git/patches
 ```
 
-In this case we plan to build Dasahro (coreboot+SeaBIOS) v24.05.00.01 for PC Engines:
+In this case we plan to build Dasharo (coreboot+SeaBIOS) v25.08.00.01 for PC
+Engines:
 
 ```bash
-git checkout v25.05.00.01
+git checkout v25.08.00.01
 ```
 
 Get back to coreboot main directory:
@@ -114,24 +115,29 @@ Tag repository, otherwise hash of the build will not match since coreboot use
 tag during build process:
 
 ```sh
-git tag -a v24.05.00.01 -m "Some annotation which conten really doesn't matter"
+git tag -a v24.08.00.01 -m "Some annotation which conten really doesn't matter"
 ```
 
 **NOTE:** It has to be annotated tag, coreboot does not pick others.
 
-### Compile
+## Release process notes
 
-To compile created code base please use [pce-fw-builder](https://github.com/pcengines/pce-fw-builder).
+After applying all patches binaries for all platforms can be build:
+
+```sh
+./build.sh seabios_apu2 && ./build.sh seabios_apu3 && ./build.sh seabios_apu4 \
+&& ./build.sh seabios_apu6
+```
 
 ## Development
 
-### How to handle bug in patches ?
+### How to handle bug in patches?
 
-- pop patches using `guilt pop` until you will have broken one on top of stack,
-- modify files,
+- Pop patches using `guilt pop` until you will have broken one on top of stack,
+- Modify files,
 - `guilt refresh` - this will store changes in required patch
 - `guilt push -a` - to make sure all patches on top apply without problems
-- commit changes to this repository
+- Commit changes to this repository
 
 Read `man guilt-pop` for efficient popping.
 
@@ -159,16 +165,6 @@ application issues. After resolving issues for given patch use `git add` to
 stage required changes and `guilt refresh` to update patch, so it reflects
 cleanly applicable change.
 
-At this point you may need to check if code still compiles at this point, that
-why [pce-fw-builder update](#pce-fw-builder-update) may be useful.
-
-#### pce-fw-builder update
-
-To understood what changes may be needed to
-[pce-fw-builder](https://github.com/pcengines/pce-fw-builder) when updating to
-new coreboot version, please check [this
-MR](https://github.com/pcengines/pce-fw-builder/pull/66).
-
 ## Background
 
 The `dasharo-pq` repository was created as a proof of concept to address issues
@@ -219,7 +215,7 @@ mentioned in [#310](https://github.com/Dasharo/dasharo-issues/issues/310).
 
 ### Why Track Patches in Git Instead of Just Using Branches?
 
-> Follwing list of arguments was heavily influenced by discussion in
+> Following list of arguments was heavily influenced by discussion in
 > [#5](https://github.com/Dasharo/dasharo-pq/pull/5). Kudos to:
 > [@krystian-hebel](https://github.com/krystian-hebel),
 > [@andyhhp](https://github.com/andyhhp),