Rewrite make_chroot.sh to use local mirrors directly.

src/scripts/make_chroot.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.
 
 # This script sets up an Ubuntu chroot environment. The ideas come
 # from https://wiki.ubuntu.com/DebootstrapChroot and conversations with
 # tedbo. The script is passed the path to an empty folder, which will be
 # populated with the files to form an Ubuntu Jaunty system with the packages
 # listed in PACKAGE_LIST_FILE (below) and their dependencies. Once created,
 # the password is set to PASSWORD (below). One can enter the chrooted
 # environment for work by running
 # enter_chroot_dev_environment.sh /path/to/chroot-root
 
 # 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 outside the chroot and as a regular user.
 assert_outside_chroot
 assert_not_root_user
 
 DEFAULT_PKGLIST="$SRC_ROOT/package_repo/package-list-dev.txt"
 
 # Define command line flags
 # See http://code.google.com/p/shflags/wiki/Documentation10x
-DEFINE_string suite "$DEFAULT_DEV_SUITE" "Repository suite to base image on."
-DEFINE_string mirror "$DEFAULT_DEV_MIRROR" "Local repository mirror to use."
-DEFINE_string mirror2 "" "Additional repository mirror to use (URL only)."
-DEFINE_string suite2 "" "Repository suite for additional mirror."
+DEFINE_string suite "$DEFAULT_DEV_SUITE" \
+  "Ubuntu suite to use to create the development chroot."
+DEFINE_string mirror "$DEFAULT_DEV_MIRROR" \
+  "Ubuntu mirror to use to create the development chroot."
 DEFINE_string chroot "$DEFAULT_CHROOT_DIR" \
   "Destination dir for the chroot environment."
 DEFINE_string pkglist "$DEFAULT_PKGLIST" \
   "File listing additional packages to install."
 DEFINE_boolean delete $FLAGS_FALSE "Delete an existing chroot." 
 DEFINE_boolean replace $FLAGS_FALSE "Overwrite existing chroot, if any."
 
 # Parse command line flags
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
@@ skipping 63 matching lines @@
     echo "Directory $FLAGS_chroot already exists."
     echo "Use --replace if you really want to overwrite it."
     exit 1
   fi
 fi
 
 # Create the destination directory
 mkdir -p "$FLAGS_chroot"
 
 # Run debootstrap to create the base chroot environment
-echo "Running debootstrap..."
+echo "Running debootstrap $FLAGS_mirror $FLAGS_suite ..."
 echo "You may need to enter password for sudo now..."
 sudo debootstrap --arch=i386 --exclude=rsyslog,ubuntu-minimal \
   "$FLAGS_suite" "$FLAGS_chroot" "$FLAGS_mirror"
 echo "Done running debootstrap."
 
 # Set up necessary mounts
 sudo mount none -t proc "$FLAGS_chroot/proc"
 sudo mount none -t devpts "$FLAGS_chroot/dev/pts"
 # ...and make sure we clean them up on exit
 trap cleanup EXIT
 
 # Set up sudoers.  Inside the chroot, the user can sudo without a password.
 # (Safe enough, since the only way into the chroot is to 'sudo chroot', so
 # the user's already typed in one sudo password...)
 bash_chroot "echo %admin ALL=\(ALL\) ALL >> /etc/sudoers"
 bash_chroot "echo $USER ALL=NOPASSWD: ALL >> /etc/sudoers"
 
-# Set up apt sources
-# If a local repository is used, it will have a different path when 
-# bind-mounted inside the chroot
-MIRROR_INSIDE="${FLAGS_mirror/$GCLIENT_ROOT/$CHROOT_TRUNK_DIR}"
-bash_chroot "echo deb $MIRROR_INSIDE $FLAGS_suite \
-  main restricted multiverse universe > /etc/apt/sources.list"
-# Additional repo? Note: Not mounted inside - must use URL
-if [ -n "$FLAGS_mirror2" ]; then
-  bash_chroot "echo deb $FLAGS_mirror2 $FLAGS_suite2 \
-    main restricted multiverse universe >> /etc/apt/sources.list"
-fi
+# Set up apt sources.
+# prefer our tools or custom packages
+bash_chroot "echo deb $DEFAULT_CHROMEOS_SERVER/tools chromiumos_dev \
+  main > /etc/apt/sources.list"
+# use specified mirror and suite for the rest of the development chroot
+bash_chroot "echo deb $FLAGS_mirror $FLAGS_suite \
+  main restricted multiverse universe >> /etc/apt/sources.list"
+# NOTE: Add additional repos here, possibly via command-line args.
 
-# TODO: enable sources when needed.  Currently, kernel source is checked in
+# Enable sources for upstream packages. Currently, kernel source is checked in
 # and all other sources are pulled via DEPS files.
-#bash_chroot "echo deb-src $MIRROR_INSIDE $FLAGS_suite \
-#  main restricted multiverse universe >> /etc/apt/sources.list"
+bash_chroot "echo deb-src $FLAGS_mirror $FLAGS_suite \
+  main restricted multiverse universe >> /etc/apt/sources.list"
 
 # Set /etc/debian_chroot so '(chroot)' shows up in shell prompts
 CHROOT_BASE=`basename $FLAGS_chroot`
 bash_chroot "echo $CHROOT_BASE > /etc/debian_chroot"
 
 # Copy config from outside chroot into chroot
 sudo cp /etc/hosts "$FLAGS_chroot/etc/hosts"
 
 # Add ourselves as a user inside the chroot
 in_chroot groupadd admin
@@ skipping 47 matching lines @@
   CHROOT_EXAMPLE_OPT="--chroot=$FLAGS_chroot"
 fi
 
 echo "All set up.  To enter the chroot, run:"
 echo "    $SCRIPTS_DIR/enter_chroot.sh $CHROOT_EXAMPLE_OPT"
 echo ""
 echo "CAUTION: Do *NOT* rm -rf the chroot directory; if there are stale bind"
 echo "mounts you may end up deleting your source tree too.  To unmount and"
 echo "delete the chroot cleanly, use:"
 echo "    $0 --delete $CHROOT_EXAMPLE_OPT"