[coreboot-gerrit] Change in coreboot[master]: paayloads/external/Linuxboot: support u-root versions

[Jens Drenhaus (Code Review)]

Jens Drenhaus has uploaded this change for review. ( https://review.coreboot.org/29516


Change subject: paayloads/external/Linuxboot: support u-root versions
......................................................................

paayloads/external/Linuxboot: support u-root versions

Since u-root uses release tags on github, now these releases can be
checked out in u-root.mk. A specific release can be selected in the Kbuild
system when u-root is set in Linuxboot payload. The default vlalue is
v2.0.0.

Change-Id: I65e1ccf0319809f7fab23142b31882e9928a5ec2
Signed-off-by: Jens Drenhaus <jens.drenhaus at 9elements.com>
---
M payloads/external/LinuxBoot/Kconfig
M payloads/external/LinuxBoot/targets/u-root.mk
2 files changed, 21 insertions(+), 3 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/29516/1

diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig
index a872d49..5e90fe5 100644
--- a/payloads/external/LinuxBoot/Kconfig
+++ b/payloads/external/LinuxBoot/Kconfig
@@ -102,17 +102,29 @@
 
 choice
 	prompt "U-root version"
-	default LINUXBOOT_UROOT_MASTER
+	default LINUXBOOT_UROOT_2_0_0
 
 config LINUXBOOT_UROOT_MASTER
 	bool "master"
 	help
 	  Latest u-root version
+
+config LINUXBOOT_UROOT_2_0_0
+	bool "v2.0.0"
+	help
+	  Latest stable u-root release version
+
+config LINUXBOOT_UROOT_1_0_0
+	bool "v1.0.0"
+	help
+	  Initial u-root release
 endchoice
 
 config LINUXBOOT_UROOT_VERSION
 	string
 	default "master" if LINUXBOOT_UROOT_MASTER
+	default "v2.0.0" if LINUXBOOT_UROOT_2_0_0
+	default "v1.0.0" if LINUXBOOT_UROOT_1_0_0
 
 config LINUXBOOT_UROOT_COMMANDS
 	string "Select u-root commands"
diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk
index 75499d7..d25902a 100644
--- a/payloads/external/LinuxBoot/targets/u-root.mk
+++ b/payloads/external/LinuxBoot/targets/u-root.mk
@@ -44,7 +44,13 @@
 	cd $(go_path_dir)/src; \
 	GOPATH=$(go_path_dir) go get -u $(uroot_git_repo)
 
-$(project_dir)/initramfs.cpio.xz: check $(go_path_dir)/bin/u-root
+checkout: $(go_path_dir)/bin/u-root
+ifneq ($(CONFIG_LINUXBOOT_UROOT_VERSION), master)
+	cd $(uroot_dir); \
+	git checkout $(CONFIG_LINUXBOOT_UROOT_VERSION)
+endif
+
+$(project_dir)/initramfs.cpio.xz: check checkout
 	@echo "    MAKE       u-root $(CONFIG_LINUXBOOT_UROOT_VERSION)"
 ifneq ($(CONFIG_LINUXBOOT_UROOT_COMMANDS),)
 ifneq ($(CONFIG_LINUXBOOT_UROOT_FILES),)
@@ -73,4 +79,4 @@
 
 build: $(project_dir)/initramfs.cpio.xz
 
-.PHONY: build all check
+.PHONY: build all check checkout

-- 
To view, visit https://review.coreboot.org/29516
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65e1ccf0319809f7fab23142b31882e9928a5ec2
Gerrit-Change-Number: 29516
Gerrit-PatchSet: 1
Gerrit-Owner: Jens Drenhaus <jens.drenhaus at 9elements.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20181106/65783244/attachment-0001.html>