Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Unified Diff: src/scripts/build_image

Issue 2113013: Fix factory_install build. (Closed) Base URL: ssh://gitrw.chromium.org/chromiumos
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/build_image
diff --git a/src/scripts/build_image b/src/scripts/build_image
index 4723ed22be3729f442f2a452b1ad9a2b98f2f789..1d3747cd21eed85433d9932effd3d1962327b62b 100755
--- a/src/scripts/build_image
+++ b/src/scripts/build_image
@@ -224,10 +224,14 @@ create_developer_image() {
sudo ln -sf vim "${ROOT_FS_DIR}/usr/local/bin/vi"
fi
- # Check that the image has been correctly created.
- "${SCRIPTS_DIR}/test_image" \
- --root="$root_fs_dir" \
- --target="$ARCH"
+ # Check that the image has been correctly created. Only do it if not
+ # building a factory install image, as the INSTALL_MASK for it will
+ # make test_image fail.
+ if [[ $FLAGS_factory_install -eq ${FLAGS_FALSE} ]] ; then
+ "${SCRIPTS_DIR}/test_image" \
+ --root="$root_fs_dir" \
+ --target="$ARCH"
+ fi
trap - EXIT
$SCRIPTS_DIR/mount_gpt_image.sh -u -r "$root_fs_dir" -s "$stateful_dir"
@@ -255,7 +259,7 @@ fi
# Create root file system disk image to fit on a 1GB memory stick.
# 1 GB in hard-drive-manufacturer-speak is 10^9, not 2^30. 950MB < 10^9 bytes.
if [[ $FLAGS_factory_install -eq ${FLAGS_TRUE} ]] ; then
- ROOT_SIZE_BYTES=$((1024 * 1024 * 180))
+ ROOT_SIZE_BYTES=$((1024 * 1024 * 300))
else
ROOT_SIZE_BYTES=$((1024 * 1024 * 720))
fi
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698