move mkimage

src/scripts/build_gpt.sh

 #!/bin/bash
 #
 # Copyright (c) 2010 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.
 #
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 . "$(dirname "$0")/common.sh"
 
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
 # Script must be run inside the chroot.
 assert_inside_chroot
 
 get_default_board
 
 # Flags.
 DEFINE_string arch "" \
   "The target architecture (\"arm\" or \"x86\")."
 DEFINE_string board "$DEFAULT_BOARD" \
   "The board to build an image for."
-DEFINE_string board_root "" \
-  "The build directory, needed to find tools for ARM."
 
 # Usage.
 FLAGS_HELP=$(cat <<EOF
 
 Usage: $(basename $0) [flags] IMAGEDIR OUTDEV
 
 This takes the image components in IMAGEDIR and creates a bootable,
 GPT-formatted image in OUTDEV. OUTDEV can be a file or block device.
 
 EOF
@@ skipping 27 matching lines @@
       ;;
     *86)
       ARCH="x86"
       ;;
     *)
       error "Unable to determine ARCH from toolchain: $CHOST"
       exit 1
   esac
 fi
 
-if [[ -z "$FLAGS_board_root" ]]; then
-  FLAGS_board_root="/build/${FLAGS_board}"
-fi
-
 # Only now can we die on error.  shflags functions leak non-zero error codes,
 # so will die prematurely if 'set -e' is specified before now.
 set -e
 # Die on uninitialized variables.
 set -u
 
 # Check for missing parts.
 ROOTFS_IMG="${IMAGEDIR}/rootfs.image"
 if [[ ! -s ${ROOTFS_IMG} ]]; then
   error "Can't find ${ROOTFS_IMG}"
@@ skipping 36 matching lines @@
   BOOTARGS="${BOOTARGS} init=/sbin/init"
   BOOTARGS="${BOOTARGS} console=ttySAC2,115200"
   BOOTARGS="${BOOTARGS} mem=1024M"
   BOOTARGS="${BOOTARGS} rootwait"
 
   MBR_SCRIPT="${IMAGEDIR}/mbr_script"
   echo -e "echo\necho ---- ChromeOS Boot ----\necho\n" \
           "setenv bootargs ${BOOTARGS}\n" \
           "mmc read 1 C0008000 $KERNEL_OFFSET $KERNEL_SECS_HEX\n" \
           "bootm C0008000" > ${MBR_SCRIPT}
-  MKIMAGE="${FLAGS_board_root}/u-boot/mkimage"
+  MKIMAGE="/usr/bin/mkimage"
   if [[ -f "$MKIMAGE".gz ]]; then
     sudo gunzip "$MKIMAGE".gz
   fi
   if [[ -x "$MKIMAGE" ]]; then
     MBR_SCRIPT_UIMG="${MBR_SCRIPT}.uimg"
     "$MKIMAGE" -A "${ARCH}" -O linux  -T script -a 0 -e 0 -n "COS boot" \
                -d ${MBR_SCRIPT} ${MBR_SCRIPT_UIMG}
     MBR_IMG=${IMAGEDIR}/mbr.img
     dd bs=1 count=`stat --printf="%s" ${MBR_SCRIPT_UIMG}` \
        if="$MBR_SCRIPT_UIMG" of="$MBR_IMG" conv=notrunc
@@ skipping 31 matching lines @@
 echo "Copying rootfs..."
 $sudo dd if=${ROOTFS_IMG} of=${OUTDEV} conv=notrunc bs=512 seek=${START_ROOTFS_A}
 
 echo "Copying EFI system partition..."
 $sudo dd if=${ESP_IMG} of=${OUTDEV} conv=notrunc bs=512 seek=${START_ESP}
 
 # Clean up temporary files.
 if [[ -n "${MBR_IMG:-}" ]]; then
   rm "${MBR_IMG}"
 fi