From 55d941033a5c8ffa72e84c49932affe1e2d0b71a Mon Sep 17 00:00:00 2001 From: Nicholas Chin Date: Sun, 25 Jun 2023 10:22:47 -0600 Subject: [PATCH] payloads/filo: Update branch name from master to main It seems like the default branch for FILO was renamed from 'master' to 'main'. TEST: FILO builds correctly when selecting 'HEAD' for the FILO version option. Change-Id: I6c355d757987551e850f9d24f6bfb14167cb8046 Signed-off-by: Nicholas Chin Reviewed-on: https://review.coreboot.org/c/coreboot/+/76101 Reviewed-by: Felix Singer Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- payloads/external/FILO/Kconfig | 2 +- payloads/external/FILO/Makefile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/payloads/external/FILO/Kconfig b/payloads/external/FILO/Kconfig index 7dc14edb9b..dae8715eed 100644 --- a/payloads/external/FILO/Kconfig +++ b/payloads/external/FILO/Kconfig @@ -9,7 +9,7 @@ config FILO_STABLE help Tested FILO version -config FILO_MASTER +config FILO_HEAD bool "HEAD" help Newest FILO version diff --git a/payloads/external/FILO/Makefile b/payloads/external/FILO/Makefile index e2fec369e8..a74752757f 100644 --- a/payloads/external/FILO/Makefile +++ b/payloads/external/FILO/Makefile @@ -1,5 +1,5 @@ -TAG-$(CONFIG_FILO_MASTER)=origin/master -NAME-$(CONFIG_FILO_MASTER)=MASTER +TAG-$(CONFIG_FILO_HEAD)=origin/main +NAME-$(CONFIG_FILO_HEAD)=MAIN TAG-$(CONFIG_FILO_STABLE)=c2fa1ea6125c63e84cdf7779c37d76da8c5bc412 NAME-$(CONFIG_FILO_STABLE)=STABLE @@ -20,7 +20,7 @@ checkout: test -d filo || \ git clone $(project_git_repo) $(project_dir) cd filo && \ - git checkout master && \ + git checkout main && \ git remote update && \ test -n $(TAG-y) && \ git branch -f $(NAME-y) $(TAG-y) && \