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

Unified Diff: src/scripts/build_image

Issue 1618007: Add /usr/local/lib to readlibs for test_image and move ldconfig higher for sful (Closed)
Patch Set: Not false 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 | « no previous file | src/scripts/check_deps » ('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 6c933356b038f967efdcb6c55aff70946ee74b1e..d52d1debefe18ce1bfe62954453dc35c119103cb 100755
--- a/src/scripts/build_image
+++ b/src/scripts/build_image
@@ -360,17 +360,6 @@ menuentry "32-bit serial" {
}
EOF
-"${SCRIPTS_DIR}/customize_rootfs" \
- --root="$ROOT_FS_DIR" \
- --target="$ARCH" \
- --board="$BOARD" \
- $WITH_DEV
-
-# Check that the image has been correctly created.
-"${SCRIPTS_DIR}/test_image" \
- --root="$ROOT_FS_DIR" \
- --target="$ARCH"
-
# Enable dev mode on the target system and re-run ldconfig
# for rootfs's ld.so.cache
if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then
@@ -385,6 +374,17 @@ if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then
sudo ln -sf "/usr/local/bin/aterm" "/usr/bin/xterm"
fi
+"${SCRIPTS_DIR}/customize_rootfs" \
+ --root="$ROOT_FS_DIR" \
+ --target="$ARCH" \
+ --board="$BOARD" \
+ $WITH_DEV
+
+# Check that the image has been correctly created.
+"${SCRIPTS_DIR}/test_image" \
+ --root="$ROOT_FS_DIR" \
+ --target="$ARCH"
+
# Clean up symlinks so they work on a running target rooted at "/".
# Here development packages are rooted at /usr/local. However, do not
# create /usr/local or /var on host (already exist on target).
« no previous file with comments | « no previous file | src/scripts/check_deps » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698