Various image build improvements for ARM

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 16 matching lines @@
 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" \
   "Comma separated set of package-list files to use."
 DEFINE_string mirror "$DEFAULT_IMG_MIRROR" \
   "The upstream package mirror to use."
 DEFINE_string suite "$DEFAULT_IMG_SUITE" \
   "The upstream package suite to use."
+DEFINE_string mirror2 "" "Additional package mirror to use (URL only)."
+DEFINE_string suite2 "" "Package suite for additional mirror."
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Die on any errors.
 set -e
 
 KERNEL_DEB_PATH=$(find "${FLAGS_build_root}/${FLAGS_arch}/local_packages" \
   -name "linux-image-*.deb")
@@ skipping 27 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_arch}/local_packages"/* \
+cp "${FLAGS_build_root}/${FLAGS_arch}/local_packages"/*.deb \
   "${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 copy:"$SETUP_DIR" local_packages/

[tedbo, 2010/01/21 19:17:14]

Why do you want to change this to copy into the apt cache? I had this as file
because I wanted to keep the build output packages separate from the ones pulled
down from other archives in terms of caching. In addition, I worried that we
might pull an older version of a built package from the apt cache if we didn't
up the version numbers across builds. Probably that worry is unfounded if the
apt-cache uses checksums properly?

[cjwatson, 2010/01/22 11:27:34]

As discussed yesterday, it's because otherwise dpkg_no_scripts.sh fails, I think
while unpacking the small initial set; I don't have the terminal scrollback any
more but I believe it was libacl1.
I'm certain that apt checks the checksum on each .deb at some point.  I'm almost
certain that this is done at the download cache level; even if it isn't, we will
get failures rather than corruption since it definitely checks that the checksum
of the thing it downloaded is what it was expecting.  But I'm pretty sure it
will just work.

Do you want me to drop this part of the change for now if you're still unsure
about it?  I'd like to get the rest in.

[tedbo, 2010/01/22 17:39:42]

No, please leave it in. I have it myself in my local tree.

On 2010/01/22 11:27:34, cjwatson wrote:

 deb $FLAGS_mirror $FLAGS_suite main restricted multiverse universe
 EOF
+if [ -n "$FLAGS_mirror2" ] && [ -n "$FLAGS_suite2" ]; then
+  cat <<EOF >> "$APT_SOURCE"
+deb $FLAGS_mirror2 $FLAGS_suite2 main restricted multiverse universe
+EOF
+fi
 
 # 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_arch}/"
 mkdir -p "${APT_CACHE_DIR}/archives/partial"
 
+if [ "${FLAGS_arch}" = x86 ]; then
+  APT_ARCH=i386
+else
+  APT_ARCH="${FLAGS_arch}"
+fi
+
 # 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";
   Install-Suggests "0";
   Get
   {
     Assume-Yes "1";
     AllowUnauthenticated "1";
   };
+  Architecture "${APT_ARCH}";
 };
 Dir
 {
   Bin {
     dpkg "${SCRIPTS_DIR}/dpkg_no_scripts.sh";
   };
   Cache "$APT_CACHE_DIR";
   Cache {
     archives "${APT_CACHE_DIR}/archives";
   };
@@ skipping 115 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