chromeos-cr50: install both Cr50 images on all devices
We want to be able to run different Cr50 images on different Chrome OS
devices based on the H1 Board ID flags settings, not based on the
model or the manufacturing phase.
BRANCH=none
BUG=b:65628825
TEST=verified both Coral and Bob have both images installed.
Change-Id: If7451aebd2a41d37128e62c5e2bdf335819ab081
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/846545
Reviewed-by: Nick Sanders <nsanders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/875120
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
Tested-by: Mary Ruthven <mruthven@chromium.org>
diff --git a/chromeos-base/chromeos-cr50/chromeos-cr50-0.0.1-r46.ebuild b/chromeos-base/chromeos-cr50/chromeos-cr50-0.0.1-r47.ebuild
similarity index 100%
rename from chromeos-base/chromeos-cr50/chromeos-cr50-0.0.1-r46.ebuild
rename to chromeos-base/chromeos-cr50/chromeos-cr50-0.0.1-r47.ebuild
diff --git a/chromeos-base/chromeos-cr50/chromeos-cr50-0.0.1.ebuild b/chromeos-base/chromeos-cr50/chromeos-cr50-0.0.1.ebuild
index e268f16..d2634cc 100644
--- a/chromeos-base/chromeos-cr50/chromeos-cr50-0.0.1.ebuild
+++ b/chromeos-base/chromeos-cr50/chromeos-cr50-0.0.1.ebuild
@@ -3,9 +3,6 @@
EAPI=5
-CROS_BOARDS=( coral fizz scarlet soraka )
-inherit cros-board
-
DESCRIPTION="Ebuild to support the Chrome OS CR50 device."
LICENSE="BSD-Google"
@@ -30,16 +27,14 @@
S="${WORKDIR}"
src_install() {
- local cr50_tarball_name
-
- if [[ -n "$(get_current_board_no_variant)" ]]; then
- cr50_tarball_name="${PRE_PVT_IMAGE}"
- else
- cr50_tarball_name="${PROD_IMAGE}"
- fi
-
- elog "Will install ${cr50_tarball_name}"
+ # Always install both pre-pvt and MP Cr50 images, let the updater at
+ # run time decide which one to use, based on the H1 Board ID flags
+ # value.
insinto /opt/google/cr50/firmware
- newins "${cr50_tarball_name}"/*.bin.prod cr50.bin.prod
+
+ elog "Will install ${PRE_PVT_IMAGE} and ${PROD_IMAGE}"
+
+ newins "${PRE_PVT_IMAGE}"/*.bin.prod cr50.bin.prepvt
+ newins "${PROD_IMAGE}"/*.bin.prod cr50.bin.prod
}
