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>
This commit is contained in:
parent
094510d964
commit
c73440844d
|
@ -177,15 +177,15 @@ if LINUXBOOT_UROOT
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "U-root version"
|
prompt "U-root version"
|
||||||
default LINUXBOOT_UROOT_MASTER
|
default LINUXBOOT_UROOT_MAIN
|
||||||
|
|
||||||
config LINUXBOOT_UROOT_CUSTOM
|
config LINUXBOOT_UROOT_CUSTOM
|
||||||
bool "custom"
|
bool "custom"
|
||||||
help
|
help
|
||||||
choose a custom u-root branch
|
choose a custom u-root branch
|
||||||
|
|
||||||
config LINUXBOOT_UROOT_MASTER
|
config LINUXBOOT_UROOT_MAIN
|
||||||
bool "master"
|
bool "main"
|
||||||
help
|
help
|
||||||
Latest u-root version
|
Latest u-root version
|
||||||
|
|
||||||
|
@ -207,7 +207,7 @@ config LINUXBOOT_UROOT_CHECKOUT
|
||||||
config LINUXBOOT_UROOT_VERSION
|
config LINUXBOOT_UROOT_VERSION
|
||||||
string
|
string
|
||||||
default LINUXBOOT_UROOT_CHECKOUT if LINUXBOOT_UROOT_CUSTOM
|
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 "v3.0.0" if LINUXBOOT_UROOT_V3_0_0
|
||||||
default "v2.0.0" if LINUXBOOT_UROOT_V2_0_0
|
default "v2.0.0" if LINUXBOOT_UROOT_V2_0_0
|
||||||
default "v1.0.0" if LINUXBOOT_UROOT_V1_0_0
|
default "v1.0.0" if LINUXBOOT_UROOT_V1_0_0
|
||||||
|
|
|
@ -39,7 +39,7 @@ endif
|
||||||
|
|
||||||
get: version
|
get: version
|
||||||
if [ -d "$(go_path_dir)/src/$(uroot_package)" ]; then \
|
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) || \
|
GOPATH=$(go_path_dir) go get -d -u -v $(uroot_package) || \
|
||||||
echo -e "\n<<u-root package update failed>>\n"; \
|
echo -e "\n<<u-root package update failed>>\n"; \
|
||||||
else \
|
else \
|
||||||
|
|
Loading…
Reference in New Issue