<p>Jens Drenhaus has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29516">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">paayloads/external/Linuxboot: support u-root versions<br><br>Since u-root uses release tags on github, now these releases can be<br>checked out in u-root.mk. A specific release can be selected in the Kbuild<br>system when u-root is set in Linuxboot payload. The default vlalue is<br>v2.0.0.<br><br>Change-Id: I65e1ccf0319809f7fab23142b31882e9928a5ec2<br>Signed-off-by: Jens Drenhaus <jens.drenhaus@9elements.com><br>---<br>M payloads/external/LinuxBoot/Kconfig<br>M payloads/external/LinuxBoot/targets/u-root.mk<br>2 files changed, 21 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/29516/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig</span><br><span>index a872d49..5e90fe5 100644</span><br><span>--- a/payloads/external/LinuxBoot/Kconfig</span><br><span>+++ b/payloads/external/LinuxBoot/Kconfig</span><br><span>@@ -102,17 +102,29 @@</span><br><span> </span><br><span> choice</span><br><span>      prompt "U-root version"</span><br><span style="color: hsl(0, 100%, 40%);">-       default LINUXBOOT_UROOT_MASTER</span><br><span style="color: hsl(120, 100%, 40%);">+        default LINUXBOOT_UROOT_2_0_0</span><br><span> </span><br><span> config LINUXBOOT_UROOT_MASTER</span><br><span>   bool "master"</span><br><span>      help</span><br><span>           Latest u-root version</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config LINUXBOOT_UROOT_2_0_0</span><br><span style="color: hsl(120, 100%, 40%);">+       bool "v2.0.0"</span><br><span style="color: hsl(120, 100%, 40%);">+       help</span><br><span style="color: hsl(120, 100%, 40%);">+    Latest stable u-root release version</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+config LINUXBOOT_UROOT_1_0_0</span><br><span style="color: hsl(120, 100%, 40%);">+        bool "v1.0.0"</span><br><span style="color: hsl(120, 100%, 40%);">+       help</span><br><span style="color: hsl(120, 100%, 40%);">+    Initial u-root release</span><br><span> endchoice</span><br><span> </span><br><span> config LINUXBOOT_UROOT_VERSION</span><br><span>  string</span><br><span>       default "master" if LINUXBOOT_UROOT_MASTER</span><br><span style="color: hsl(120, 100%, 40%);">+  default "v2.0.0" if LINUXBOOT_UROOT_2_0_0</span><br><span style="color: hsl(120, 100%, 40%);">+   default "v1.0.0" if LINUXBOOT_UROOT_1_0_0</span><br><span> </span><br><span> config LINUXBOOT_UROOT_COMMANDS</span><br><span>   string "Select u-root commands"</span><br><span>diff --git a/payloads/external/LinuxBoot/targets/u-root.mk b/payloads/external/LinuxBoot/targets/u-root.mk</span><br><span>index 75499d7..d25902a 100644</span><br><span>--- a/payloads/external/LinuxBoot/targets/u-root.mk</span><br><span>+++ b/payloads/external/LinuxBoot/targets/u-root.mk</span><br><span>@@ -44,7 +44,13 @@</span><br><span>      cd $(go_path_dir)/src; \</span><br><span>     GOPATH=$(go_path_dir) go get -u $(uroot_git_repo)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-$(project_dir)/initramfs.cpio.xz: check $(go_path_dir)/bin/u-root</span><br><span style="color: hsl(120, 100%, 40%);">+checkout: $(go_path_dir)/bin/u-root</span><br><span style="color: hsl(120, 100%, 40%);">+ifneq ($(CONFIG_LINUXBOOT_UROOT_VERSION), master)</span><br><span style="color: hsl(120, 100%, 40%);">+        cd $(uroot_dir); \</span><br><span style="color: hsl(120, 100%, 40%);">+    git checkout $(CONFIG_LINUXBOOT_UROOT_VERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+$(project_dir)/initramfs.cpio.xz: check checkout</span><br><span>    @echo "    MAKE       u-root $(CONFIG_LINUXBOOT_UROOT_VERSION)"</span><br><span> ifneq ($(CONFIG_LINUXBOOT_UROOT_COMMANDS),)</span><br><span> ifneq ($(CONFIG_LINUXBOOT_UROOT_FILES),)</span><br><span>@@ -73,4 +79,4 @@</span><br><span> </span><br><span> build: $(project_dir)/initramfs.cpio.xz</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-.PHONY: build all check</span><br><span style="color: hsl(120, 100%, 40%);">+.PHONY: build all check checkout</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29516">change 29516</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29516"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I65e1ccf0319809f7fab23142b31882e9928a5ec2 </div>
<div style="display:none"> Gerrit-Change-Number: 29516 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Jens Drenhaus <jens.drenhaus@9elements.com> </div>