commit 5a3f75cc5847bf733caedebd37ce8d1e5453eb7d
author Paul Fagerburg <pfagerburg@google.com> Fri Sep 10 09:59:31 2021 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Sep 10 17:14:16 2021 +0000
tree 4c93ea4c3df0c2fd5f59cc085422a881b05ad120
parent 130d07297135d2f3fdf36d8294fe177d77081777

new_variant: fix private yaml path for hatch

The private overlay directory for Hatch was renamed in CL*4111775,
which broke new_variant support for Hatch. Update the path.

BUG=b:197038156
TEST=`new_variant_fulltest.sh hatch && echo PASS`

Cq-Depend: chrome-internal:4111775
Change-Id: I697df9e6e88cb51b26dbaa7e8de2be2de1faa56c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/3153692
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>

contrib/variant/hatch.py

diff --git a/contrib/variant/hatch.py b/contrib/variant/hatch.py
index 9288f05..9040b5b 100644
--- a/contrib/variant/hatch.py
+++ b/contrib/variant/hatch.py
@@ -56,7 +56,7 @@
 # List of packages to cros_workon
 workon_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-hatch-private']
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private']
 
 # The emerge command
 emerge_cmd = 'emerge-hatch'
@@ -64,21 +64,21 @@
 # List of packages to emerge
 emerge_pkgs = [
     'coreboot', 'libpayload', 'vboot_reference', 'depthcharge', fsp,
-    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-hatch-private',
+    fitimage_pkg, 'chromeos-ec', 'chromeos-config-bsp-private',
     'chromeos-config', 'chromeos-config-bsp', 'chromeos-config-bsp-hatch',
     'coreboot-private-files', 'chromeos-bootimage']
 
 # List of packages to cros_workon to build the project config
-config_workon_pkgs = ['chromeos-config', 'chromeos-config-bsp-hatch-private']
+config_workon_pkgs = ['chromeos-config', 'chromeos-config-bsp-private']
 
 # List of packages to emerge to build the project config
 config_emerge_pkgs = [
     'chromeos-config-bsp', 'chromeos-config',
-    'chromeos-config-bsp-hatch', 'chromeos-config-bsp-hatch-private']
+    'chromeos-config-bsp-hatch', 'chromeos-config-bsp-private']
 
 # Directory for the private yaml file
 private_yaml_dir = '~/trunk/src/private-overlays/overlay-hatch-private/'\
-    'chromeos-base/chromeos-config-bsp-hatch-private'
+    'chromeos-base/chromeos-config-bsp-private'
 
 # List of commits that will be uploaded with `repo upload`
 repo_upload_list = [