From 503efe1f658be7938865a3e27f4ea1ec2ceda8c2 Mon Sep 17 00:00:00 2001
From: Chris Sosa <sosa@chromium.org>
Date: Thu, 8 Apr 2010 10:05:46 -0700
Subject: [PATCH] Add /usr/local/lib to readlibs for test_image and move
 ldconfig higher for sful

Review URL: http://codereview.chromium.org/1618007
---
 build_image | 22 +++++++++++-----------
 check_deps  |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/build_image b/build_image
index 6c933356b0..d52d1debef 100755
--- a/build_image
+++ b/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).
diff --git a/check_deps b/check_deps
index 366bb5c8d7..2a349d9f01 100755
--- a/check_deps
+++ b/check_deps
@@ -32,6 +32,7 @@ class CheckDependencies(object):
     # required for understanding old-style Netscape plugins.
     self._ReadLibs([
         "%s/lib" % root,
+        "%s/usr/local/lib" % root,
         "%s/usr/lib" % root,
         "%s/usr/lib/nss" % root,
         "%s/usr/lib/nspr" % root,