diff options
| author | Nicholas Chin <nic.c3.14@gmail.com> | 2023-06-25 09:54:00 -0600 |
|---|---|---|
| committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | 2023-06-28 15:46:52 +0000 |
| commit | 981ef52e87ec9fb062ca7c3a89694b58dfd57f1c (patch) | |
| tree | dcac0dbd83ef7c07f70209971a34af4ac4653bc3 /payloads | |
| parent | 55d941033a5c8ffa72e84c49932affe1e2d0b71a (diff) | |
payloads/Memtest86Plus: Update branch name from master to main
It seems like the default branch for coreboot's Memtest86+ fork was
renamed from 'master' to 'main'.
TEST: Memtest builds correctly when selecting 'Main' for the Memtest86+
version option.
Change-Id: I269249518019f5d0d12c57f1c14012abca86b48b
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76100
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/external/Makefile.inc | 2 | ||||
| -rw-r--r-- | payloads/external/Memtest86Plus/Kconfig.secondary | 6 | ||||
| -rw-r--r-- | payloads/external/Memtest86Plus/Makefile | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 85e01b964d..e367cb8866 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -319,7 +319,7 @@ payloads/external/Memtest86Plus/memtest86plus/memtest: $(DOTCONFIG) AS="$(AS_x86_32)" \ CONFIG_MEMTEST_REVISION=$(CONFIG_MEMTEST_REVISION) \ CONFIG_MEMTEST_REVISION_ID=$(CONFIG_MEMTEST_REVISION_ID) \ - CONFIG_MEMTEST_MASTER=$(CONFIG_MEMTEST_MASTER) \ + CONFIG_MEMTEST_MAIN=$(CONFIG_MEMTEST_MAIN) \ CONFIG_MEMTEST_STABLE=$(CONFIG_MEMTEST_STABLE) \ $(MEMTEST_SERIAL_OPTIONS) \ MFLAGS= MAKEFLAGS= diff --git a/payloads/external/Memtest86Plus/Kconfig.secondary b/payloads/external/Memtest86Plus/Kconfig.secondary index 7c4da9e509..98a0d06cb9 100644 --- a/payloads/external/Memtest86Plus/Kconfig.secondary +++ b/payloads/external/Memtest86Plus/Kconfig.secondary @@ -11,8 +11,8 @@ config MEMTEST_STABLE Stable Memtest86+ version. For reproducible builds, this option must be selected. -config MEMTEST_MASTER - bool "Master" +config MEMTEST_MAIN + bool "Main" help Newest Memtest86+ version. @@ -35,7 +35,7 @@ endchoice config MEMTEST_REVISION_ID string "Insert a commit's SHA-1 or a branch name" depends on MEMTEST_REVISION - default "origin/master" + default "origin/main" help The commit's SHA-1 or branch name of the revision to use. diff --git a/payloads/external/Memtest86Plus/Makefile b/payloads/external/Memtest86Plus/Makefile index 3853cb9586..fe24e2c780 100644 --- a/payloads/external/Memtest86Plus/Makefile +++ b/payloads/external/Memtest86Plus/Makefile @@ -1,7 +1,7 @@ ## SPDX-License-Identifier: GPL-2.0-only -TAG-$(CONFIG_MEMTEST_MASTER)=origin/master -NAME-$(CONFIG_MEMTEST_MASTER)=Master +TAG-$(CONFIG_MEMTEST_MAIN)=origin/main +NAME-$(CONFIG_MEMTEST_MAIN)=Main TAG-$(CONFIG_MEMTEST_STABLE)=0bd34c22604660e4283316331f3e7bf8a3863753 NAME-$(CONFIG_MEMTEST_STABLE)=Stable TAG-$(CONFIG_MEMTEST_REVISION)=$(CONFIG_MEMTEST_REVISION_ID) @@ -26,14 +26,14 @@ endif false endif -cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; \ - if [ $$? -ne 0 ] || [ "$(TAG-y)" = "origin/master" ]; then \ + if [ $$? -ne 0 ] || [ "$(TAG-y)" = "origin/main" ]; then \ echo " Fetching new commits from the $(project_name) git repo"; \ git fetch; fi checkout: fetch echo " Checking out $(project_name) revision $(NAME-y) ($(TAG-y))" cd $(project_dir); \ - git checkout master; \ + git checkout main; \ git branch -D coreboot 2>/dev/null; \ git checkout -b coreboot $(TAG-y) |