Skip to content

Commit

Permalink
Use edk2-stable202402 for x64 and edk2-stable202211 for arm64
Browse files Browse the repository at this point in the history
edk2-stable202402 is the latest Edk2 release and works with x64.

Newer versions of Edk2 require a fix in bootloader shim v15.8 to be
usable in arm64, and currently v15.7 is included in Ubuntu images. So
using edk2-stable202211 for arm64, which is the latest release that
works.

[1] rhboot/shim#539
  • Loading branch information
pykello committed Mar 8, 2024
1 parent 0a1b735 commit cf714da
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ jobs:
include:
- runner: ubicloud-standard-2
platform: x64
edk2_version: edk2-stable202402
edk2_commit: edc6681206c1a8791981a2f911d2fb8b3d2f5768
- runner: ubicloud-standard-2-arm
edk2_version: edk2-stable202211
edk2_commit: fff6d81270b57ee786ea18ad74f43149b9f03494
platform: arm64

steps:
Expand All @@ -19,12 +23,14 @@ jobs:
- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install uuid-dev iasl build-essential python3-distutils git libbrotli-dev nasm
- name: Build edk2
run: ./build-edk2
run: EDK2_COMMIT=${{ matrix.edk2_commit}} ./build-edk2
- name: List produced files
run: ls
- uses: ncipollo/release-action@v1
if: github.event_name == 'workflow_dispatch' && github.ref_type == 'tag'
if: github.event_name == 'workflow_dispatch'
with:
artifacts: "${{ github.workspace }}/CLOUDHV-${{ matrix.platform }}.fd"
body: "Release ${{ github.ref_name }}"
body: "Release ${{ matrix.edk2_version }}-${{ matrix.platform }}"
name: "${{ matrix.edk2_version }}-${{ matrix.platform }}"
tag: "${{ matrix.edk2_version }}-${{ matrix.platform }}"
allowUpdates: true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ the following in a Debian or Ubuntu environment:
# If you need build dependencies:
$ sudo apt-get update && sudo apt-get -y install uuid-dev iasl build-essential python3-distutils git libbrotli-dev nasm

$ ./build-edk2
$ EDK2_COMMIT=edc6681206c1a8791981a2f911d2fb8b3d2f5768 ./build-edk2
```
8 changes: 6 additions & 2 deletions build-edk2
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@
# sudo -- bash -c 'apt-get update && apt-get install -y make gcc g++ flex bison nasm m4 uuid-dev g++'

WORKLOADS_DIR="$(pwd)"
EDK2_COMMIT="8736b8fdca85e02933cdb0a13309de14c9799ece"
EDK2_PLAT_COMMIT="b5fa396700e728c0e18b512229226f65337bf74a"
EDK2_PLAT_COMMIT="103c88ba5b0c6259fc674e6358c68a85e882e41b"
ACPICA_COMMIT="f16a0b4d0f0edd7b78a332fcf507be2187fac21e"

set -uex

if [ -z "$EDK2_COMMIT" ]; then
echo "Error: EDK2_COMMIT is not set." >&2
exit 1
fi

# Checkout source code of a GIT repo with specified branch and commit
# Args:
# $1: Target directory
Expand Down

0 comments on commit cf714da

Please sign in to comment.