[PATCH] mainline builds: enable automated chroot setup for maverick

[john.johansen at canonical.com]

From: John Johansen <john.johansen at canonical.com>

Enable automated chroot setup via chroot-setup/build-mkschroot
as documented in wiki.ubuntu.com/KernelTeam/KernelMaintenanceStarter

Signed-off-by: John Johansen <john.johansen at canonical.com>
---
 buildscripts/build-init              |    2 +-
 chroot-setup/build-mkschroot         |    3 +++
 kernel-team-accounts/update-repos.sh |    2 +-
 mainline-build/mainline-build        |    3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/buildscripts/build-init b/buildscripts/build-init
index 7fda70b..3b1e17c 100755
--- a/buildscripts/build-init
+++ b/buildscripts/build-init
@@ -19,7 +19,7 @@ fi
 if [ ! -d "${CONFDIR}/distros" ]; then
 	mkdir "${CONFDIR}/distros"
 fi
-for distro in dapper hardy intrepid jaunty karmic lucid; do
+for distro in dapper hardy intrepid jaunty karmic lucid maverick; do
 	if [ ! -f "${CONFDIR}/distros/${distro}" ]; then
 		echo "Creating distro(${distro})"
 		cat <<-EOD >"${CONFDIR}/distros/${distro}"
diff --git a/chroot-setup/build-mkschroot b/chroot-setup/build-mkschroot
index e03c38e..8674f6c 100755
--- a/chroot-setup/build-mkschroot
+++ b/chroot-setup/build-mkschroot
@@ -90,6 +90,9 @@ case $SUITE in
 	lucid)
 		ADDPKG="$ADDPKG makedumpfile"
 		;;
+	maverick)
+		ADDPKG="$ADDPKG makedumpfile"
+		;;
 	*)
 		if [ "$SUITE" != "" ]; then
 			echo "Unknown suite <$SUITE>!" >&2
diff --git a/kernel-team-accounts/update-repos.sh b/kernel-team-accounts/update-repos.sh
index e74bef7..2315c6e 100755
--- a/kernel-team-accounts/update-repos.sh
+++ b/kernel-team-accounts/update-repos.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 LOCALDIR=/usr3/ubuntu
-REPOS="dapper hardy intrepid jaunty karmic lucid"
+REPOS="dapper hardy intrepid jaunty karmic lucid maverick"
 LINUX=linux-2.6
 LINUX_REPO=git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/${LINUX}.git
 UBUNTU_REPO=git://kernel.ubuntu.com/ubuntu
diff --git a/mainline-build/mainline-build b/mainline-build/mainline-build
index 7848983..49c0232 100755
--- a/mainline-build/mainline-build
+++ b/mainline-build/mainline-build
@@ -30,7 +30,8 @@ v2.6.24*)	master_release="hardy" ;;
 v2.6.27*)	master_release="intrepid" ;;
 v2.6.28*|v2.6.29*|v2.6.30*)	master_release="jaunty" ;;
 v2.6.31*)	master_release="karmic" ;;
-*)		master_release="lucid" ;;
+v2.6.32*)	master_release="lucid" ;;
+*)		master_release="maverick" ;;
 esac
 
 master_repo="/srv/kernel.ubuntu.com/git/ubuntu/ubuntu-${master_release}.git"
-- 
1.7.0.4