From 08cf195f4c1165412fd2286d19c20c08a2a4300e Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Wed, 14 Sep 2016 14:41:36 +0200 Subject: payloads/external/GRUB2: Add "git revision" to the GRUB2 version menu This change is based on the following commit: 3aa91dc payloads/seabios: Add "git revision" to the SeaBIOS version menu Change-Id: I9987e3673e70b5cb20173d1ddff6060f42a5374a Signed-off-by: Denis 'GNUtoo' Carikli Reviewed-on: https://review.coreboot.org/18352 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- payloads/external/GRUB2/Kconfig | 16 ++++++++++++++++ payloads/external/GRUB2/Makefile | 2 ++ 2 files changed, 18 insertions(+) (limited to 'payloads/external/GRUB2') diff --git a/payloads/external/GRUB2/Kconfig b/payloads/external/GRUB2/Kconfig index c9f07d537c..656f7c9e23 100644 --- a/payloads/external/GRUB2/Kconfig +++ b/payloads/external/GRUB2/Kconfig @@ -9,8 +9,24 @@ config GRUB2_MASTER help Newest GRUB2 version +config GRUB2_REVISION + bool "git revision" + help + Select this option if you have a specific commit or branch + that you want to use as the revision from which to + build GRUB2. + + You will be able to specify the name of a branch or a commit id + later. endchoice +config GRUB2_REVISION_ID + string "Insert a commit's SHA-1 or a branch name" + depends on GRUB2_REVISION + default "origin/master" + help + The commit's SHA-1 or branch name of the revision to use. + config GRUB2_EXTRA_MODULES string "Extra modules to include in GRUB image" help diff --git a/payloads/external/GRUB2/Makefile b/payloads/external/GRUB2/Makefile index 137fec2847..7cac6a3219 100644 --- a/payloads/external/GRUB2/Makefile +++ b/payloads/external/GRUB2/Makefile @@ -1,5 +1,7 @@ TAG-$(CONFIG_GRUB2_MASTER)= +TAG-$(CONFIG_GRUB2_REVISION)=$(CONFIG_GRUB2_REVISION_ID) NAME-$(CONFIG_GRUB2_MASTER)=HEAD +NAME-$(CONFIG_GRUB2_REVISION)=$(CONFIG_GRUB2_REVISION_ID) project_git_repo=git://git.sv.gnu.org/grub.git project_dir=grub2 -- cgit v1.2.3