Split the binary and source mirror defaults

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
@@ skipping 11 matching lines @@
 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" \
   "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 mirror_src "$DEFAULT_DEV_MIRROR" \
+  "Ubuntu mirror to use to apt-get package sources."
 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 92 matching lines @@
 # 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.
 
 # 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 $FLAGS_mirror $FLAGS_suite \
+bash_chroot "echo deb-src $FLAGS_mirror_src $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
@@ skipping 48 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"