edk2: fetch submodules manually for 202408 #353800
Open
+92
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
10.rebuild-darwin: 0
mjoerg
force-pushed
the
edk2-202408-fix-submodules
branch
from
425e0e7
to
f7533e5
Compare
Original submodule sources are no longer available, so the submodules are fetched manually, with unavailable sources replaced by mirrors. (tianocore/edk2#6402) fix NixOS#353769 submodules-202408.nix was generated using the following script. #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils git jq nixfmt-rfc-style nix-prefetch-git set -eu -o pipefail version=202408 git_remote=origin git_repo=https://github.com/tianocore/edk2 git_rev=refs/tags/edk2-stable$version tmp=$(mktemp -d) trap 'rm -rf -- "$tmp"' EXIT git_dir=$tmp/git git init --bare "$git_dir" git -C "$git_dir" remote add "$git_remote" "$git_repo" git -C "$git_dir" fetch --depth 1 --filter=blob:none "$git_remote" "$git_rev:$git_rev" git -C "$git_dir" show "$git_rev:.gitmodules" > "$tmp/submodules" submodules="{}" for module in $(git config get -f "$tmp/submodules" --all \ --name-only --show-names --regexp '^submodule\.[^.]+\.path$'); do module=${module#submodule.} module=${module%.path} module_path=$(git config get -f "$tmp/submodules" "submodule.$module.path") module_url=$(git config get -f "$tmp/submodules" "submodule.$module.url") module_rev=$(git -C "$git_dir" ls-tree --object-only "$git_rev" "$module_path") # tianocore/edk2#6402 case $module_url in https://github.com/Zeex/subhook.git) module_url=https://github.com/tianocore/edk2-subhook.git;; esac module_repo=${module_url#https://github.com/} module_repo=${module_repo%.git} module_owner=${module_repo%/*} module_repo=${module_repo#*/} module_hash=$(nix-prefetch-git --fetch-submodules "$module_url" "$module_rev" | jq -r .hash) submodules=$(jq --argjson submodules "$submodules" \ --arg path "$module_path" \ --arg owner "$module_owner" \ --arg repo "$module_repo" \ --arg rev "$module_rev" \ --arg hash "$module_hash" \ -n '$submodules + {$path: {"owner": $owner, "repo": $repo, "rev": $rev, "hash": $hash}}') done echo "$submodules" > "$tmp/result.json" nix eval --impure --expr "builtins.fromJSON (builtins.readFile \"$tmp/result.json\")" | \ nixfmt > submodules-$version.nix
mjoerg
force-pushed
the
edk2-202408-fix-submodules
branch
from
f7533e5
to
f0a7086
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Original submodule sources are no longer available, so the submodules are fetched manually,
with unavailable sources replaced by mirrors. (tianocore/edk2#6402)
fix #353769
nixpkgs-reviewresultGenerated using
nixpkgs-review.Command:
nixpkgs-reviewx86_64-linuxThings done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.