cros_update_firmware: adding config-bsp-baseboard package
chromeos-config-bsp-baseboard is introduced for some projects (e.g. fizz)
therefore the package needs to be added to the firmware uprev procedure.
BUG=None
TEST=run cros_update_firmware on coral and nami
Change-Id: Ia8f48e9fe5db0c0de694b29baf905e81551cbc16
Reviewed-on: https://chromium-review.googlesource.com/1003394
Commit-Ready: YH Lin <yueherngl@chromium.org>
Tested-by: YH Lin <yueherngl@chromium.org>
Reviewed-by: YH Lin <yueherngl@chromium.org>
diff --git a/cros_update_firmware b/cros_update_firmware
index 371181e..cb4e7a8 100755
--- a/cros_update_firmware
+++ b/cros_update_firmware
@@ -34,7 +34,7 @@
update_firmware() {
local board="$1"
- local base ebuild srcuris cfg_bsp_pkg
+ local base ebuild srcuris cfg_bsp_pkg cfg_bsp_baseboard_pkg
set -e
@@ -42,14 +42,18 @@
cfg_bsp_pkg="chromeos-config-bsp"
equery-${board} w chromeos-base/chromeos-config-bsp > /dev/null 2>&1 \
|| cfg_bsp_pkg="chromeos-config-bsp-${board}-private"
- cros_workon --board="${board}" start "${cfg_bsp_pkg}" \
+ # check if chromeos-config-bsp-baseboard is in use
+ cfg_bsp_baseboard_pkg="chromeos-config-bsp-baseboard"
+ equery-${board} w chromeos-base/chromeos-config-bsp-baseboard > /dev/null 2>&1 \
+ || cfg_bsp_baseboard_pkg=
+ cros_workon --board="${board}" start ${cfg_bsp_baseboard_pkg} "${cfg_bsp_pkg}" \
"chromeos-firmware-${board}"
base="${GCLIENT_ROOT}/src/private-overlays/overlay-${board}-private/chromeos-base"
ebuild="${base}/chromeos-firmware-${board}/chromeos-firmware-${board}-9999.ebuild"
srcuris="${base}/chromeos-firmware-${board}/files/srcuris"
- "emerge-${board}" "${cfg_bsp_pkg}" chromeos-config
+ "emerge-${board}" ${cfg_bsp_baseboard_pkg} "${cfg_bsp_pkg}" chromeos-config
cros_config_host -c "/build/${board}/usr/share/chromeos-config/config.dtb" \
get-firmware-uris > "${srcuris}"
touch "${ebuild}"
