Modified build_image to support new crossdev.

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 244 matching lines @@
 STATEFUL_LOOP_DEV=
 ESP_LOOP_DEV=
 
 # ${DEV_IMAGE_ROOT} specifies the location of where developer packages will
 # be installed on the stateful dir.  On a Chromium OS system, this will
 # translate to /usr/local.
 DEV_IMAGE_ROOT="${STATEFUL_FS_DIR}/dev_image"
 
 # What cross-build are we targeting?
 . "${BOARD_ROOT}/etc/make.conf.board_setup"
-LIBC_VERSION=${LIBC_VERSION:-"2.10.1-r1"}
+LIBC_VERSION=${LIBC_VERSION:-"2.10.1-r2"}

[davidjames, 2011/02/25 19:22:18]

So it looks like LIBC_VERSION has been in
${BOARD_ROOT}/etc/make.conf.board_setup since Feb 10, 2010. If someone has a
board older than that, they probably won't have version 2.10.1-r2 (or even
2.10.1-r1) of binutils yet. Maybe time to delete this backwards compatibility
hack?

 
 if [ ${FLAGS_jobs} -ne -1 ]; then
   EMERGE_JOBS="--jobs=${FLAGS_jobs}"
 fi
 
 # Figure out ARCH from the given toolchain.
 # TODO: Move to common.sh as a function after scripts are switched over.
 TC_ARCH=$(echo "${CHOST}" | awk -F'-' '{ print $1 }')
 case "${TC_ARCH}" in
   arm*)
@@ skipping 318 matching lines @@
   DISK_LABEL="C-STATE"
   sudo losetup "${STATEFUL_LOOP_DEV}" "${STATEFUL_FS_IMG}"
   sudo mkfs.ext3 "${STATEFUL_LOOP_DEV}"
   sudo tune2fs -L "${DISK_LABEL}" -U "${UUID}" -c 0 -i 0 "${STATEFUL_LOOP_DEV}"
   sudo mount "${STATEFUL_LOOP_DEV}" "${STATEFUL_FS_DIR}"
 
   # -- Install packages into the root file system --
 
   # We need to install libc manually from the cross toolchain.
   # TODO: Improve this? We only want libc and not the whole toolchain.
-  PKGDIR="/var/lib/portage/pkgs/cross/"
-  sudo tar jxvpf \
-    "${PKGDIR}/${CHOST}/cross-${CHOST}"/glibc-${LIBC_VERSION}.tbz2 \
-    -C "${ROOT_FS_DIR}" --strip-components=3 \
+  # TODO(raymes): Remove this check after some time which ensures
+  # backward compatibility with the crossdev location change

[davidjames, 2011/02/25 19:22:18]

Please add a trailing period.

+  PKGDIR="/var/lib/portage/pkgs"
+  LIBC_TAR="glibc-${LIBC_VERSION}.tbz2"
+  NEW_LIBC_PATH="${PKGDIR}/cross-${CHOST}/${LIBC_TAR}"
+  OLD_LIBC_PATH="${PKGDIR}/cross/${CHOST}/cross-${CHOST}/${LIBC_TAR}"
+  if [ -e "${NEW_LIBC_PATH}" ] ; then
+    LIBC_PATH="${NEW_LIBC_PATH}"
+  else
+    LIBC_PATH="${OLD_LIBC_PATH}"
+  fi
+
+  sudo tar jxvpf "${LIBC_PATH}" -C "${ROOT_FS_DIR}" --strip-components=3 \
     --exclude=usr/include --exclude=sys-include --exclude=*.a --exclude=*.o
 
   # We need to install libstdc++ manually from the cross toolchain.
   # TODO: Figure out a better way of doing this?
   sudo cp -a "${BOARD_ROOT}"/lib/libgcc_s.so* "${ROOT_FS_DIR}/lib"
   sudo cp -a "${BOARD_ROOT}"/usr/lib/libstdc++.so* "${ROOT_FS_DIR}/usr/lib"
 
   # Prepare stateful partition with some pre-created directories.
   sudo mkdir -p "${DEV_IMAGE_ROOT}"
   sudo mkdir -p "${STATEFUL_FS_DIR}/var"
@@ skipping 192 matching lines @@
   echo "Developer image created as ${DEVELOPER_IMAGE_NAME}"
 fi
 
 print_time_elapsed
 
 echo "To copy to USB keyfob, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdX"
 echo "To convert to VMWare image, INSIDE the chroot, do something like:"
 echo "  ./image_to_vm.sh --from=${OUTSIDE_OUTPUT_DIR} --board=${BOARD}"
 echo "from the scripts directory where you entered the chroot."