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

Unified Diff: src/scripts/build_image

Issue 2019008: Dev flag is not used in customize_rootfs and we should not be making dev-specific changes there. (Closed) Base URL: ssh://git@chromiumos-git//chromeos
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 88f420d1491dbfbbd436e8cdcf45e2636f2125b6..3eb32e4a8c41e44a01b6d66d3824a4fa0c95e2bf 100755
--- a/src/scripts/build_image
+++ b/src/scripts/build_image
@@ -342,12 +342,6 @@ if [[ $FLAGS_withtest -eq $FLAGS_TRUE ]] ; then
--usepkgonly chromeos-test $EMERGE_JOBS
fi
-# Perform any customizations on the root file system that are needed.
-EXTRA_CUSTOMIZE_ROOTFS_FLAGS=""
-if [ $FLAGS_withdev -eq $FLAGS_TRUE ]; then
- EXTRA_CUSTOMIZE_ROOTFS_FLAGS="--withdev"
-fi
-
# Extract the kernel from the root filesystem for use by the GPT image. Legacy
# BIOS will use the kernel in the rootfs (via syslinux), Chrome OS BIOS will
# use the kernel partition.
@@ -406,11 +400,11 @@ if [[ $FLAGS_withdev -eq $FLAGS_TRUE ]] ||\
sudo /sbin/ldconfig -r "$ROOT_FS_DIR"
fi
+# Perform any customizations on the root file system that are needed.
"${SCRIPTS_DIR}/customize_rootfs" \
--root="$ROOT_FS_DIR" \
--target="$ARCH" \
- --board="$BOARD" \
- $EXTRA_CUSTOMIZE_ROOTFS_FLAGS
+ --board="$BOARD"
# Check that the image has been correctly created.
"${SCRIPTS_DIR}/test_image" \
« 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