Fix i386 hardcode.

src/scripts/install_packages.sh

 #!/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 install packages into the target root file system.
 #
 # NOTE: This script should be called by build_image.sh. Do not run this
 # on your own unless you know what you are doing.
 
 # 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"
 
 # Script must be run inside the chroot
 assert_inside_chroot
 assert_not_root_user
 
 DEFAULT_PKGLIST="${SRC_ROOT}/package_repo/package-list-prod.txt"
 
 # Flags
 DEFINE_string output_dir "" \
   "The location of the output directory to use [REQUIRED]."
 DEFINE_string root ""      \
   "The root file system to install packages in."
-DEFINE_string target "x86" \
-  "The target architecture to build for. One of { x86, arm }."
+DEFINE_string arch "x86" \
+  "The target architecture to build for. One of { x86, armel }."
 DEFINE_string build_root "$DEFAULT_BUILD_ROOT"                \
   "Root of build output"
 DEFINE_string package_list "$DEFAULT_PKGLIST" \
   "The package list file to use."
 DEFINE_string server "$DEFAULT_EXT_MIRROR" \
   "The package server to use."
 DEFINE_string suite "$DEFAULT_IMG_SUITE" \
   "The package suite to use."
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Die on any errors.
 set -e
 
-KERNEL_DEB_PATH=$(find "${FLAGS_build_root}/${FLAGS_target}/local_packages" \
+KERNEL_DEB_PATH=$(find "${FLAGS_build_root}/${FLAGS_arch}/local_packages" \
   -name "linux-image-*.deb")
 KERNEL_DEB=$(basename "${KERNEL_DEB_PATH}" .deb | sed -e 's/linux-image-//' \
   -e 's/_.*//')
 KERNEL_VERSION=${KERNEL_VERSION:-${KERNEL_DEB}}
 
 if [[ -z "$FLAGS_output_dir" ]]; then
   echo "Error: --output_dir is required."
   exit 1
 fi
 OUTPUT_DIR=$(readlink -f "$FLAGS_output_dir")
@@ skipping 18 matching lines @@
 
   # Sometimes the volatile directory is left mounted and sometimes it is not,
   # so we precede by '!' to disable the ERR trap.
   ! sudo umount "$ROOT_FS_DIR"/lib/modules/2.6.*/volatile/ > /dev/null 2>&1
 
   sudo umount "${ROOT_FS_DIR}/proc"
 }
 
 # Set up repository for locally built packages; these take highest precedence.
 mkdir -p "${SETUP_DIR}/local_packages"
-cp "${FLAGS_build_root}/${FLAGS_target}/local_packages"/* \
+cp "${FLAGS_build_root}/${FLAGS_arch}/local_packages"/* \
   "${SETUP_DIR}/local_packages"
 cd "$SETUP_DIR"
 dpkg-scanpackages local_packages/ /dev/null | \
    gzip > local_packages/Packages.gz
 cd -
 
 # Create the temporary apt source.list used to install packages.
 APT_SOURCE="${OUTPUT_DIR}/sources.list"
 cat <<EOF > "$APT_SOURCE"
 deb file:"$SETUP_DIR" local_packages/
 deb $FLAGS_server $FLAGS_suite main restricted multiverse universe
 EOF
 
 # Cache directory for APT to use. This cache is re-used across builds. We
 # rely on the cache to reduce traffic to the hosted repositories.
-APT_CACHE_DIR="${FLAGS_build_root}/apt_cache-${FLAGS_target}/"
+APT_CACHE_DIR="${FLAGS_build_root}/apt_cache-${FLAGS_arch}/"
 mkdir -p "${APT_CACHE_DIR}/archives/partial"
 
 # Create the apt configuration file. See "man apt.conf"
 APT_PARTS="${OUTPUT_DIR}/apt.conf.d"
 mkdir -p "$APT_PARTS"  # An empty apt.conf.d to avoid other configs.
 export APT_CONFIG="${OUTPUT_DIR}/apt.conf"
 cat <<EOF > "$APT_CONFIG"
 APT
 {
   Install-Recommends "0";
@@ skipping 59 matching lines @@
 sudo mkdir -p "${ROOT_FS_DIR}/var/lib/apt/lists/partial"  \
   "${ROOT_FS_DIR}/var/lib/dpkg/updates"
 
 # Download the initial packages into the apt cache if necessary.
 REPO="${APT_CACHE_DIR}/archives"
 sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive apt-get update
 sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive \
   apt-get --download-only install $PACKAGES $EXTRA_PACKAGES
 
 # Install initial packages directly with dpkg_no_scripts.sh
+ARCH="$FLAGS_arch"
+if [ "$ARCH" = "x86" ]; then
+  ARCH="i?86"  # Match i386 | i686
+fi
 for p in $PACKAGES $EXTRA_PACKAGES; do
-  PKG=$(ls "${REPO}"/${p}_*_i386.deb || /bin/true)
+  PKG=$(ls "${REPO}"/${p}_*_$ARCH.deb || /bin/true)
   if [ -z "$PKG" ]; then
     PKG=$(ls "${REPO}"/${p}_*_all.deb)
   fi
   sudo "${SCRIPTS_DIR}"/dpkg_no_scripts.sh \
     --root="$ROOT_FS_DIR" --nodpkg_fallback --unpack "$PKG"
   sudo "${SCRIPTS_DIR}"/dpkg_no_scripts.sh \
     --root="$ROOT_FS_DIR" --nodpkg_fallback --configure "$p"
 done
 
 # Make sure that apt is ready to work. We use --fix-broken to trigger apt
@@ skipping 41 matching lines @@
   apt-get --force-yes install "linux-image-${KERNEL_VERSION}"
 
 # List all packages installed so far, since these are what the local
 # repository needs to contain.
 # TODO: Replace with list_installed_packages.sh when it is fixed up.
 dpkg --root="${ROOT_FS_DIR}" -l > \
   "${OUTPUT_DIR}/package_list_installed.txt"
 
 cleanup_rootfs_mounts
 trap - EXIT