commit 0a01fab0c15f03ee661ede5786a58ee48755a454
author Tim Wawrzynczak <twawrzynczak@chromium.org> Wed Aug 11 16:42:35 2021 -0600
committer Commit Bot <commit-bot@chromium.org> Thu Aug 12 01:51:24 2021 +0000
tree 509aef450e17565282cdf0c350df9f34950f5489
parent 207786a09e8b7b5bb5f67ff74f8962882b50a47e

new_variant_fulltest: Fix 207786a0 ("new_variant: Add support...")

The mentioned commit broke new_variant_fulltest for everything non-brya0
by using a separate firmware target for depthcharge. Instead, make this
explicit and only use the separate target for brya0.

BUG=b:193527706
TEST=new_variant_fulltest.sh volteer2 passes
new_variant_fulltest.sh brya0 passes

Change-Id: I7ddae05bd6d396bbea46b1d4012105cc83cc0f6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3089774
Tested-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>

contrib/variant/testdata/new_variant_fulltest.sh

diff --git a/contrib/variant/testdata/new_variant_fulltest.sh b/contrib/variant/testdata/new_variant_fulltest.sh
index cef46fd..20ffe09 100755
--- a/contrib/variant/testdata/new_variant_fulltest.sh
+++ b/contrib/variant/testdata/new_variant_fulltest.sh
@@ -26,6 +26,9 @@
 # ${var,,} converts to all lowercase.
 REFERENCE="${1,,}"
 
+# Support for depthcharge variants was added later, so the default is no support
+SUPPORTS_DC_VARIANT=0
+
 # Set variables depending on the reference board.
 #
 # All boards:
@@ -145,6 +148,7 @@
     FITIMAGE=brya0
     FITIMAGE_OUTPUTS_DIR=/mnt/host/source/src/private-overlays/baseboard-brya-private/sys-boot/coreboot-private-files-baseboard-brya/files/blobs
     FITIMAGE_FILES_DIR=/mnt/host/source/src/private-overlays/baseboard-brya-private/sys-boot/coreboot-private-files-baseboard-brya/files
+    SUPPORTS_DC_VARIANT=1
     ;;
 
   *)
@@ -236,7 +240,7 @@
   popd
 fi
 
-# Explicitly set the desired firmware targets
+# Explicitly set the desired firmware targets (if SUPPORTS_DC_VARIANT is 1)
 BUILD_TARGETS_SED="s/_FW_BUILD_CONFIG = None/_FW_BUILD_CONFIG = sc.create_fw_build_config(sc.create_fw_build_targets(\
 coreboot='${NEW}',\
 depthcharge='${NEW}',\
@@ -254,9 +258,15 @@
   # fw_build_config.sh to make the changes we need. Instead just apply the
   # changes manually.
   pushd "${CONFIG_DIR}/${NEW}"
-  # Load sw_config.star and update FW_BUILD_CONFIG to new project and build the config
-  sed -i '4s/^/load("\/\/config\/util\/sw_config.star",sc="sw_config")\n/' config.star
-  sed -i -e "${BUILD_TARGETS_SED}" config.star
+
+  if [[ ${SUPPORTS_DC_VARIANT} -eq 1 ]] ; then
+    # Load sw_config.star and update FW_BUILD_CONFIG to new project and build the config
+    sed -i '4s/^/load("\/\/config\/util\/sw_config.star",sc="sw_config")\n/' config.star
+    sed -i -e "${BUILD_TARGETS_SED}" config.star
+  else
+      # Use the same build target for everything
+      sed -i -e "s/_FW_BUILD_CONFIG = None/_FW_BUILD_CONFIG = program.firmware_build_config(_${NEW_UPPER})/" config.star
+  fi
   ./config.star
   popd
 fi