Add /usr/local/lib to readlibs for test_image and move ldconfig higher for sful

src/scripts/build_image

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to build a bootable keyfob-based chromeos system image from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 342 matching lines @@
 sudo cp ${ROOT_FS_DIR}/boot/vmlinuz ${ESP_DIR}/efi/boot/vmlinuz
 cat <<EOF | sudo dd of=${ESP_DIR}/efi/boot/grub.cfg
 set timeout=2
 set default=0
 
 menuentry "32-bit serial" {
   linux /efi/boot/vmlinuz earlyprintk=serial,ttyS0,115200 i915.modeset=0 console=ttyS0,115200 acpi=off init=/sbin/init boot=local rootwait root=/dev/sda3 ro noresume noswap loglevel=7
 }
 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
   # Flag will mount /usr/local on target device
   sudo mkdir -p "$ROOT_FS_DIR/root"
   sudo touch "$ROOT_FS_DIR/root/.dev_mode"
 
   # Re-run ldconfig to fix /etc/ldconfig.so.cache
   sudo /sbin/ldconfig -r "$ROOT_FS_DIR"
 
   #TODO(sosa@chromium.org) - /usr/bin/xterm symlink not created in stateful.
   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).
 setup_symlinks_on_root "/usr/local" "/var"
 
 # Cleanup loop devices.
 cleanup
 
 # Create the GPT-formatted image
 ${SCRIPTS_DIR}/build_gpt.sh \
    --arch=${ARCH} --board=${FLAGS_board} --board_root=${BOARD_ROOT} \
    "${OUTPUT_DIR}" "${OUTPUT_IMG}"
 
 # Clean up temporary files.
 rm -f "${ROOT_FS_IMG}" "${STATEFUL_IMG}" "${OUTPUT_DIR}/vmlinuz.image" \
   "${ESP_IMG}"
 rmdir "${ROOT_FS_DIR}" "${STATEFUL_DIR}" "${ESP_DIR}"
 
 OUTSIDE_OUTPUT_DIR="../build/images/${FLAGS_board}/${IMAGE_SUBDIR}"
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "To copy to USB keyfob, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdb"
 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."
 
 trap - EXIT