diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2022-03-04 13:23:39 +0100 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-04-13 14:30:37 +0000 |
| commit | c73440844d009d60c7ce86747072166c8b5cf3ec (patch) | |
| tree | fbea84dd04360934faee7301da8752cf888555f3 /payloads | |
| parent | 094510d96491a0628a4188454fb57de391fd5378 (diff) | |
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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62590
Reviewed-by: Christian Walter <christian.walter@9elements.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/external/LinuxBoot/Kconfig | 8 | ||||
| -rw-r--r-- | payloads/external/LinuxBoot/targets/u-root.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index a1e4e1fc0b..b4bb05333a 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -177,15 +177,15 @@ if LINUXBOOT_UROOT 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 - bool "master" +config LINUXBOOT_UROOT_MAIN + bool "main" help Latest u-root version @@ -207,7 +207,7 @@ config LINUXBOOT_UROOT_CHECKOUT 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 0cf91fec5b..af2f95af6b 100644 --- a/payloads/external/LinuxBoot/targets/u-root.mk +++ b/payloads/external/LinuxBoot/targets/u-root.mk @@ -39,7 +39,7 @@ endif 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 \ |