variant: use baseboard name for all packages
There were several package names that still included "hatch" as
a fixed string; replaced these with the baseboard name. Also
update the package name for the FSP to use the appropriate
chipset.
BUG=b:146646594
TEST=Run the script to create variants of hatch and volteer
baseboards. Ensure that it uses the correct directories for each
of them.
Change-Id: I9551789cece6b354cdb4378d342214abb577266c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/1991541
Tested-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
diff --git a/contrib/variant/new_variant.py b/contrib/variant/new_variant.py
index 35d8dc9..8ad6534 100755
--- a/contrib/variant/new_variant.py
+++ b/contrib/variant/new_variant.py
@@ -441,8 +441,16 @@
True if the script succeeded, False otherwise
"""
logging.info('Running stage add_fitimage')
- status.workon += ['intel-cmlfsp']
- status.emerge += ['intel-cmlfsp']
+ pkg = 'coreboot-private-files-' + status.board
+ # The FSP depends on the baseboard model. We don't have to check for
+ # the baseboard not being in this hash because we already checked
+ # for an unsupported baseboard when the script started.
+ fsp = {
+ 'hatch': 'intel-cmlfsp',
+ 'volteer': 'intel-tglfsp'
+ }
+ status.workon += [fsp[status.board], pkg]
+ status.emerge += [fsp[status.board], pkg]
add_fitimage_sh = os.path.expanduser(os.path.join(
'~/trunk/src/private-overlays',
'baseboard-' + status.board + '-private',
@@ -675,10 +683,15 @@
True if the scripts and build succeeded, False is something failed
"""
logging.info('Running stage add_variant_to_yaml')
- status.workon += ['chromeos-config-bsp-hatch-private']
+ # TODO(pfagerburg) these can change in response to firmware changes
+ # or new board-specific support scripts that might handle the entire
+ # build or at least specify the packages so that this program doesn't
+ # have to know.
+ status.workon += ['chromeos-config-bsp-' + status.board + '-private']
status.emerge += ['chromeos-config', 'chromeos-config-bsp',
- 'chromeos-config-bsp-hatch', 'chromeos-config-bsp-hatch-private',
- 'coreboot-private-files', 'coreboot-private-files-hatch']
+ 'chromeos-config-bsp-' + status.board,
+ 'chromeos-config-bsp-' + status.board + '-private',
+ 'coreboot-private-files', 'coreboot-private-files-' + status.board]
add_variant_to_yaml_sh = os.path.expanduser(
'~/trunk/src/platform/dev/contrib/variant/add_variant_to_yaml.sh')
if run_process(