mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 06:31:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move chromeos-factory into mod_image_for_test

Browse Source 
Previously it was a dependency of chromeos-test which isn't correct

BUG=none
TEST=Build base and factory images

Change-Id: I133b937d1b56f96d5ebf3428172f9a4457c6bf5e
Reviewed-on: https://gerrit.chromium.org/gerrit/31156
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Ready: Liam McLoughlin <lmcloughlin@chromium.org>
Tested-by: Liam McLoughlin <lmcloughlin@chromium.org>
This commit is contained in:
Liam McLoughlin 2012-08-22 14:41:23 -07:00 committed by Gerrit
parent 06d3c2e20b
commit eb7ccc33b3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build_library/test_image_util.sh
View File

@ -127,7 +127,8 @@ mod_image_for_test () {
emerge_to_image --root="${ROOT_FS_DIR}" factorytest-init emerge_to_image --root="${ROOT_FS_DIR}" factorytest-init
INSTALL_MASK="${FACTORY_TEST_INSTALL_MASK}" INSTALL_MASK="${FACTORY_TEST_INSTALL_MASK}"
emerge_to_image --root="${ROOT_FS_DIR}/usr/local" \ emerge_to_image --root="${ROOT_FS_DIR}/usr/local" \
chromeos-base/autotest chromeos-base/autotest-all chromeos-base/autotest chromeos-base/autotest-all \
chromeos-base/chromeos-factory
prepare_hwid_for_factory "${BUILD_DIR}" prepare_hwid_for_factory "${BUILD_DIR}"
local mod_factory_script local mod_factory_script

1
build_packages
View File

@ -152,6 +152,7 @@ if [[ "${FLAGS_withdev}" -eq "${FLAGS_TRUE}" ]]; then
PACKAGES="${PACKAGES} chromeos-base/chromeos-dev" PACKAGES="${PACKAGES} chromeos-base/chromeos-dev"
fi fi
if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then if [[ "${FLAGS_withfactory}" -eq "${FLAGS_TRUE}" ]]; then
PACKAGES="${PACKAGES} chromeos-base/chromeos-factory"
PACKAGES="${PACKAGES} chromeos-base/chromeos-factoryinstall" PACKAGES="${PACKAGES} chromeos-base/chromeos-factoryinstall"
PACKAGES="${PACKAGES} chromeos-base/factorytest-init" PACKAGES="${PACKAGES} chromeos-base/factorytest-init"
PACKAGES="${PACKAGES} chromeos-base/chromeos-hwid" PACKAGES="${PACKAGES} chromeos-base/chromeos-hwid"