Skip to content

Commit

Permalink
snapcraft: edk2: Use more of snapcraft's default pull mechanisms (can…
Browse files Browse the repository at this point in the history
…onical#597)

 - Switch to source-commit and empty source-submodules.
 - Reduce customisations to override-pull stage.
 - Move downloading submodules into override-pull stage.
  • Loading branch information
tomponline authored Nov 7, 2024
2 parents 39a7858 + eeb0880 commit adc5e55
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ parts:
edk2:
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 @@ -382,9 +383,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 @@ -393,11 +401,6 @@ parts:
git config user.email "[email protected]"
git config user.name "LXD snap builder"
# Fix submodules
# 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
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

0 comments on commit adc5e55

Please sign in to comment.