Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

snapcraft: edk2: Use more of snapcraft's default pull mechanisms (5.21-candidate) #617

Merged
merged 2 commits into from
Nov 13, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@ parts:
- nasm
source: https://github.com/tianocore/edk2
source-depth: 1
source-tag: IRRELEVANT
source-commit: 8736b8fdca85e02933cdb0a13309de14c9799ece # edk2-stable202311
source-submodules: []
source-type: git
plugin: nil
build-packages:
Expand All @@ -344,9 +345,16 @@ parts:
craftctl default
override-pull: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && exit 0
craftctl default

set -ex
git config --global transfer.fsckobjects true
git clone https://github.com/tianocore/edk2 . -b edk2-stable202311

# Fix submodule sources
# see https://github.com/tianocore/edk2/commit/95d8a1c255cfb8e063d679930d08ca6426eb5701
sed -i "s#https://github.com/Zeex/subhook.git#https://github.com/tianocore/edk2-subhook.git#g" .gitmodules

# Pull submodules after switching to source-commit
git submodule update --init --recursive
override-build: |-
[ "$(uname -m)" != "x86_64" ] && [ "$(uname -m)" != "aarch64" ] && exit 0
set -ex
Expand All @@ -355,10 +363,6 @@ parts:
git config user.email "[email protected]"
git config user.name "LXD snap builder"

# Fix submodules
sed -i "s#https://git.cryptomilk.org/projects/cmocka#https://gitlab.com/cmocka/cmocka#g" .gitmodules
git submodule update --init --recursive

# Apply patches
patch -p1 < "${CRAFT_PROJECT_DIR}/patches/edk2-0001-force-DUID-LLT.patch"
cp "${CRAFT_PROJECT_DIR}/patches/edk2-0002-logo.bmp" MdeModulePkg/Logo/Logo.bmp
Expand Down