Index: src/scripts/common.sh |
diff --git a/src/scripts/common.sh b/src/scripts/common.sh |
index 2a3c5d25a5cc66e7e24601746efc6e6cc2169dae..184642ab51932c07dc65960bdf460e243b6f5493 100644 |
--- a/src/scripts/common.sh |
+++ b/src/scripts/common.sh |
@@ -77,20 +77,18 @@ fi |
# Load shflags |
. "$SRC_ROOT/third_party/shflags/files/src/shflags" |
-# Mirrors and build suites come in 3 flavors |
-# EXT - external source used to build local package repository |
-# DEV - development chroot, from local package repository |
-# IMG - bootable image, from local package repository |
- |
-# Build suites |
-DEFAULT_EXT_SUITE=${CHROMEOS_EXT_SUITE:-"chromeos_dev"} |
-DEFAULT_DEV_SUITE=${CHROMEOS_DEV_SUITE:-"chromeos_dev"} |
-DEFAULT_IMG_SUITE=${CHROMEOS_IMG_SUITE:-"chromeos"} |
- |
-# Package repositories (mirrors) |
-DEFAULT_EXT_MIRROR=${CHROMEOS_EXT_MIRROR:-"http://build.chromium.org/buildbot/packages"} |
-DEFAULT_DEV_MIRROR=${CHROMEOS_DEV_MIRROR:-"file://$GCLIENT_ROOT/repo/apt"} |
-DEFAULT_IMG_MIRROR=${CHROMEOS_IMG_MIRROR:-"copy:///home/$USER/trunk/repo/apt"} |
+# Our local mirror |
+DEFAULT_CHROMEOS_SERVER=${CHROMEOS_SERVER:-"http://build.chromium.org/mirror"} |
+ |
+# Upstream mirrors and build suites come in 2 flavors |
+# DEV - development chroot, used to build the chromeos image |
+# IMG - bootable image, to run on actual hardware |
+ |
+DEFAULT_DEV_MIRROR=${CHROMEOS_DEV_MIRROR:-"${DEFAULT_CHROMEOS_SERVER}/ubuntu"} |
+DEFAULT_DEV_SUITE=${CHROMEOS_DEV_SUITE:-"karmic"} |
+ |
+DEFAULT_IMG_MIRROR=${CHROMEOS_IMG_MIRROR:-"${DEFAULT_CHROMEOS_SERVER}/ubuntu"} |
+DEFAULT_IMG_SUITE=${CHROMEOS_IMG_SUITE:-"karmic"} |
# Default location for chroot |
DEFAULT_CHROOT_DIR=${CHROMEOS_CHROOT_DIR:-"$GCLIENT_ROOT/chroot"} |