Attention is currently required from: Arthur Heymans. Hello Arthur Heymans,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/62590
to review the following change.
Change subject: payloads/LinuxBoot: Fix u-root branch ......................................................................
payloads/LinuxBoot: Fix u-root branch
It looks like the u-root 'master' branch was renamed to 'main'.
Change-Id: I384ba66289a49bf226b505615bd16bdf85612c1a Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M payloads/external/LinuxBoot/Kconfig M payloads/external/LinuxBoot/targets/u-root.mk 2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/62590/1
diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index a1e4e1f..1c5db19 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -177,14 +177,14 @@
choice prompt "U-root version" - default LINUXBOOT_UROOT_MASTER + default LINUXBOOT_UROOT_MAIN
config LINUXBOOT_UROOT_CUSTOM bool "custom" help choose a custom u-root branch
-config LINUXBOOT_UROOT_MASTER +config LINUXBOOT_UROOT_MAIN bool "master" help Latest u-root version @@ -207,7 +207,7 @@ config LINUXBOOT_UROOT_VERSION string default LINUXBOOT_UROOT_CHECKOUT if LINUXBOOT_UROOT_CUSTOM - default "master" if LINUXBOOT_UROOT_MASTER + default "main" if LINUXBOOT_UROOT_MAIN default "v3.0.0" if LINUXBOOT_UROOT_V3_0_0 default "v2.0.0" if LINUXBOOT_UROOT_V2_0_0 default "v1.0.0" if LINUXBOOT_UROOT_V1_0_0 diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk index 0cf91fe..af2f95a 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -39,7 +39,7 @@
get: version if [ -d "$(go_path_dir)/src/$(uroot_package)" ]; then \ - git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet master; \ + git -C $(go_path_dir)/src/$(uroot_package) checkout --quiet main; \ GOPATH=$(go_path_dir) go get -d -u -v $(uroot_package) || \ echo -e "\n<<u-root package update failed>>\n"; \ else \