diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2016-09-14 14:41:36 +0200 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-02-24 03:50:02 +0100 |
| commit | 08cf195f4c1165412fd2286d19c20c08a2a4300e (patch) | |
| tree | 8ae926a565ef6e28a65aade6957df5f594a0fa28 /payloads | |
| parent | 9b798d7904f50b8ad83fe43442a5a3da85789bdd (diff) | |
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 <GNUtoo@no-log.org>
Reviewed-on: https://review.coreboot.org/18352
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/external/GRUB2/Kconfig | 16 | ||||
| -rw-r--r-- | payloads/external/GRUB2/Makefile | 2 | ||||
| -rw-r--r-- | payloads/external/Makefile.inc | 2 |
3 files changed, 20 insertions, 0 deletions
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 diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc index 1c0d38ccbf..921c840c3e 100644 --- a/payloads/external/Makefile.inc +++ b/payloads/external/Makefile.inc @@ -134,6 +134,8 @@ grub2: CC="$(CC_x86_32)" LD="$(LD_x86_32)" OBJDUMP="$(OBJDUMP_x86_32)" \ OBJCOPY="$(OBJCOPY_x86_32)" STRIP="$(STRIP_x86_32)" \ CONFIG_GRUB2_MASTER=$(CONFIG_GRUB2_MASTER) \ + CONFIG_GRUB2_REVISION=$(CONFIG_GRUB2_REVISION) \ + CONFIG_GRUB2_REVISION_ID=$(CONFIG_GRUB2_REVISION_ID) \ CONFIG_GRUB2_EXTRA_MODULES=$(CONFIG_GRUB2_EXTRA_MODULES) payloads/external/GRUB2/grub2/build/default_payload.elf: grub2 |