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

Unified Diff: src/scripts/build_image

Issue 1774021: Modifies dev server to produce stateful gzip and modify image_to_live to use it. (Closed) Base URL: ssh://git@chromiumos-git//chromeos
Patch Set: Fixes for seano Created 10 years, 8 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 | « src/platform/dev/stateful_update.sh ('k') | src/scripts/image_to_live.sh » ('j') | 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 33c4acf9494feeb4698179cc8757f0ead1500f74..86e134640413221e355609821e130968a36d0888 100755
--- a/src/scripts/build_image
+++ b/src/scripts/build_image
@@ -332,7 +332,6 @@ if [[ $FLAGS_withdev -eq $FLAGS_TRUE ]] ; then
# TODO(sosa@chromium.org) - Re-hide under statefuldev after switch
# Flag will mount /usr/local on target device
sudo mkdir -p "$ROOT_FS_DIR/root"
- sudo touch "$ROOT_FS_DIR/root/.dev_mode"
# The ldd tool is a useful shell script but lives in glibc; just copy it.
sudo cp -a "$(which ldd)" "${ROOT_DEV_DIR}/usr/bin"
@@ -410,13 +409,14 @@ menuentry "boot from usb with serial debug" {
EOF
-# Run ldconfig for rootfs's ld.so.cache
-if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then
- # Re-run ldconfig to fix /etc/ldconfig.so.cache
- sudo /sbin/ldconfig -r "$ROOT_FS_DIR"
+# By default, dev mode should be activated for either development builds or
+# test builds.
+if [[ $FLAGS_withdev -eq $FLAGS_TRUE ]] ||\
+ [[ $FLAGS_withtest -eq $FLAGS_TRUE ]]; then
+ sudo touch "$ROOT_FS_DIR/root/.dev_mode"
- #TODO(sosa@chromium.org) - /usr/bin/xterm symlink not created in stateful.
- sudo ln -sf "/usr/local/bin/aterm" "/usr/bin/xterm"
+ # Re-run ldconfig to fix /etc/ldconfig.so.cache.
+ sudo /sbin/ldconfig -r "$ROOT_FS_DIR"
fi
"${SCRIPTS_DIR}/customize_rootfs" \
« no previous file with comments | « src/platform/dev/stateful_update.sh ('k') | src/scripts/image_to_live.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698