<p>Martin Roth <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/20667">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Marshall Dawson: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">depthcharge: Update build<br><br>- Add prompt so the defconfig can be selected for the build.<br>- Remove target rename code from makefile. The old versions don't build<br>with the latest vboot, so this isn't useful anymore.<br>- Change $(info ...) to an echo. info prints immediately when<br>evaluated, which made it print when it shouldn't have, on make clean<br>for example.<br>- Split up single line shell scripts into multiple lines<br>- Change checkout target to only update the commit id when actually<br>changing versions instead of on every build.<br><br>Change-Id: I46fc2822cf93c821b402e8961ceecedc088f486c<br>Signed-off-by: Martin Roth <martinroth@google.com><br>Reviewed-on: https://review.coreboot.org/20667<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M payloads/external/depthcharge/Kconfig<br>M payloads/external/depthcharge/Makefile<br>2 files changed, 31 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/payloads/external/depthcharge/Kconfig b/payloads/external/depthcharge/Kconfig<br>index a913c7e..9fd1268 100644<br>--- a/payloads/external/depthcharge/Kconfig<br>+++ b/payloads/external/depthcharge/Kconfig<br>@@ -36,7 +36,7 @@<br> default "payloads/external/depthcharge/depthcharge/build/depthcharge.elf"<br> <br> config LP_DEFCONFIG_OVERRIDE<br>- def_bool n<br>+ bool "Use default libpayload config"<br> help<br> The Depthcharge makefile looks for a file config.<boardname> in the<br> libpayload/configs directory. Say Y here to use the file defconfig<br>diff --git a/payloads/external/depthcharge/Makefile b/payloads/external/depthcharge/Makefile<br>index fb2d96d..1c8d345 100644<br>--- a/payloads/external/depthcharge/Makefile<br>+++ b/payloads/external/depthcharge/Makefile<br>@@ -15,11 +15,6 @@<br> TAG-$(DEPTHCHARGE_STABLE)=$(STABLE_COMMIT_ID)<br> TAG-$(DEPTHCHARGE_REVISION)=$(DEPTHCHARGE_REVISION_ID)<br> <br>-# todo: consider reverting this once stable moves past the commit below<br>-payload_target=depthcharge<br>-payload_target_old=$(payload_target)_unified<br>-payload_namechange=74a07395eb9976747055b4ac7a0ae7dcb603a6f4<br>-<br> unexport KCONFIG_AUTOHEADER<br> unexport KCONFIG_AUTOCONFIG<br> unexport KCONFIG_DEPENDENCIES<br>@@ -31,57 +26,70 @@<br> BOARD:=$(notdir $(CONFIG_MAINBOARD_DIR))<br> <br> ifeq ($(OVERRIDE_DEFCONFIG),y)<br>-$(info Depthcharge: Using default defconfig for libpayload)<br> libpayload_config=$(libpayload_dir)/configs/defconfig<br>+DEPTHCHARGE_LIBPAYLOAD_MSG="Depthcharge: Using default defconfig for libpayload"<br> else<br> libpayload_config=$(libpayload_dir)/configs/config.$(BOARD)<br>+DEPTHCHARGE_LIBPAYLOAD_MSG="Depthcharge: Using $(libpayload_dir)/configs/config.$(BOARD)"<br> endif<br> <br> all: build<br> <br> $(project_dir):<br>- echo " Cloning $(project_name) from Git"<br>- git clone $(project_git_repo)<br>+ @echo " Cloning $(project_name) from Git"<br>+ @git clone $(project_git_repo) $(project_name)<br> <br> fetch: $(project_dir)<br>- cd $(project_dir); git show $(TAG-y) >/dev/null 2>&1 ; if [ $$? -ne 0 ] || \<br>+ @cd $(project_dir); \<br>+ git show $(TAG-y) >/dev/null 2>&1; \<br>+ if [ $$? -ne 0 ] || \<br> [ "$(TAG-y)" = "origin/master" ]; then \<br> echo " Fetching new commits from the $(project_name) git repo"; \<br> git fetch; fi<br> <br>-checkout: fetch<br>+# Check out the requested version of the tree<br>+# Don't write a file for master branch so the latest remote version is always used<br>+$(project_dir)/.version_$(TAG-y):<br>+ $(MAKE) fetch<br> echo " Checking out $(project_name) revision $(TAG-y)"<br>- cd $(project_dir) ; git checkout master; git branch -D coreboot 2>/dev/null; git checkout -b coreboot $(TAG-y)<br>+ rm -f $(project_dir)/.version_*<br>+ cd $(project_dir); \<br>+ git checkout master; \<br>+ git branch -D coreboot 2>/dev/null; \<br>+ git checkout -b coreboot $(TAG-y)<br>+ifneq ($(DEPTHCHARGE_MASTER),y)<br>+ touch $(project_dir)/.version_$(TAG-y)<br>+endif<br> <br> $(libpayload_install_dir): $(project_dir)<br>- test -f $(libpayload_config)|| \<br>+ test -f $(libpayload_config) || \<br> (echo "Error: $(libpayload_config) is not present" && \<br> false)<br>+ echo $(DEPTHCHARGE_LIBPAYLOAD_MSG)<br> cp $(libpayload_config) $(libpayload_dir)/.config<br> $(MAKE) -C $(libpayload_dir) olddefconfig<br> $(MAKE) -C $(libpayload_dir)<br> $(MAKE) -C $(libpayload_dir) install DESTDIR=$(libpayload_install_dir)<br>-# rm -f $(libpayload_dir)/.config<br> <br>-config: $(libpayload_install_dir) checkout<br>+config: $(project_dir)/.version_$(TAG-y) $(libpayload_install_dir)<br> echo " CONFIG project_name $(TAG-y)"<br> export VERSION=$$(cd depthcharge && \<br> git describe --tags --long --dirty 2>/dev/null || \<br> echo "unknown") ; \<br>- cd $(project_dir) && $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \<br>+ cd $(project_dir) && \<br>+ $(MAKE) BOARD=$(BOARD) \<br>+ LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \<br> VB_SOURCE=$(VBOOT_SOURCE) defconfig<br> <br> build: config<br> echo " MAKE $(project_name) $(TAG-y)"<br>- cd $(project_dir) && \<br>- git merge-base --is-ancestor $(payload_namechange) $(TAG-y) >/dev/null 2>&1 && \<br>- $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \<br>- VB_SOURCE=$(VBOOT_SOURCE) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" $(payload_target) || \<br>- $(MAKE) BOARD=$(BOARD) LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \<br>- VB_SOURCE=$(VBOOT_SOURCE) PATH="$(abspath ../../../build/util/cbfstool):$$PATH" $(payload_target_old)<br>+ $(MAKE) -C $(project_dir) depthcharge BOARD=$(BOARD) \<br>+ LIBPAYLOAD_DIR=$(libpayload_install_dir)/libpayload \<br>+ VB_SOURCE=$(VBOOT_SOURCE) \<br>+ PATH="$(abspath ../../../build/util/cbfstool):$$PATH"<br> <br> clean:<br>- test -d $(output_dir) && rm -rf $(output_dir) || exit 0<br>+ test -d $(output_dir) && rm -rf $(output_dir)<br> <br> distclean:<br> rm -rf $(project_dir)<br></pre><p>To view, visit <a href="https://review.coreboot.org/20667">change 20667</a>. To unsubscribe, 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/20667"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: I46fc2822cf93c821b402e8961ceecedc088f486c </div>
<div style="display:none"> Gerrit-Change-Number: 20667 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Evelyn Huang <evhuang@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Marc Jones <marc@marcjonesconsulting.com> </div>
<div style="display:none"> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>