Build: allow package lists to be filtered by arch.

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.
@@ skipping 195 matching lines @@
 sudo ln -sf /bin/true "${ROOT_FS_DIR}/usr/sbin/update-rc.d"
 
 # Set up mounts for working within the rootfs. We copy some basic
 # network information from the host so that maintainer scripts can
 # access the network as needed.
 # TODO: All of this rootfs mount stuff can be removed as soon as we stop
 # running the maintainer scripts on install.
 sudo mount -t proc proc "${ROOT_FS_DIR}/proc"
 trap cleanup_rootfs_mounts EXIT
 
+filter_pkgs() {
+  pkglist="$1"
+  arch="$2"
+
+  # to read list of package + version skipping empty lines and comments, and
+  # convert "foo 1.2-3" to "foo=1.2-3", use:
+  #pkgs="$(grep '^[^#]' "$pkglist" | cut -d ' ' -f 1-2 | sed 's/ /=/')"
+
+  # read list of "package [optional arch list]" skipping empty lines and
+  # comments
+  grep '^[^#]' "$pkglist" | while read pkg archspec; do
+    case "$archspec" in
+      ""|"[$arch "*|"[$arch]"|*" $arch]")
+        echo "$pkg"
+      ;;
+      *"!$arch "*|*"!$arch]")
+        :
+      ;;
+      "["*"!"*"]")
+        echo "$pkg"
+      ;;
+    esac
+  done
+}
+
 # Install packages from the given package-lists
 PACKAGE_LISTS=$(echo "$FLAGS_package_list" | sed -e 's/,/ /g')
+PKG_LIST_ARCH="$FLAGS_arch"
+if [ "$PKG_LIST_ARCH" = "x86" ]; then
+  PKG_LIST_ARCH="i386"
+fi
 for p in $PACKAGE_LISTS; do
-  COMPONENTS=$(cat "$p" |             \
-    sed -e 's/#.*//' |                \
-    grep -v '^ *$' |                  \
-    sed '/$/{N;s/\n/ /;}')
+  COMPONENTS=$(filter_pkgs "$p" "$PKG_LIST_ARCH")
   sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive \
        ARCH="$FLAGS_arch" apt-get --force-yes install $COMPONENTS
 done
 
 # Create kernel installation configuration to suppress warnings,
 # install the kernel in /boot, and manage symlinks.
 cat <<EOF | sudo dd of="${ROOT_FS_DIR}/etc/kernel-img.conf"
 link_in_boot = yes
 do_symlinks = yes
 minimal_swap = yes
 clobber_modules = yes
 warn_reboot = no
 do_bootloader = no
 do_initrd = yes
 warn_initrd = no
 EOF
 
 # Install the kernel.
 sudo APT_CONFIG="$APT_CONFIG" DEBIAN_FRONTEND=noninteractive ARCH="$FLAGS_arch"\
   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