Merge lp:~pjdc/launchpad-buildd/chroot-scripts into lp:~canonical-sysadmins/launchpad-buildd/chroot-scripts

[Paul Collins]

various fixes needed to create bionic porter chroots

=== modified file 'make-chroot.sh'
--- make-chroot.sh	2016-03-22 00:49:24 +0000
+++ make-chroot.sh	2018-03-29 02:34:15 +0000
@@ -128,7 +128,7 @@
  	    --nomangle)		pkgmangle=""; shift;;
 	    --debian)		debian=yes; shift;;				# building a debian chroot
  	    --xdebian)		debian=yes; xdebian=yes; shift;;		# cross-built debian
-	    --ubuntu-porter)	dchroot=yes; home=yes; proposed=yes; rapt=yes; shift;;
+	    --ubuntu-porter)	home=yes; proposed=yes; rapt=yes; shift;;
 	    --user)		buildduser=$2; shift; shift;;
 	    --noarchuser)	noarchuser=yes; shift;;
 	    --group)		builddgroup=$2; shift; shift;;
@@ -257,12 +257,15 @@
 
 # figure out whether or not we should be using --ports
 case "$distro:$arch" in
+	*:arm64)	ports=-ports;;
 	*:armel)	ports=-ports;;
 	*:armhf)	ports=-ports;;
 	*:hppa)		ports=-ports;;
 	*:ia64)		ports=-ports;;
 	*:lpia)		ports=-ports;;
+	*:ppc64el)	ports=-ports;;
 	dapper:sparc)	;;
+	*:s390x)	ports=-ports;;
 	*:sparc)	ports=-ports;;
 	warty:powerpc)		;;
 	hoary:powerpc)		;;
@@ -419,24 +422,26 @@
 		[l-o]*)		catsuite=lucid-cat;;
 		[p-r]*)		catsuite=precise-cat;;
 		saucy)		catsuite=saucy-cat;;
-		[t-v]*)		catsuite=trusty-cat;;
-		*)		catsuite=trusty-cat;;
+		[t-w]*)		catsuite=trusty-cat;;
+		[x-z]*)		catsuite=xenial-cat;;
+		*)		catsuite=;; # -cat is not signed, which apt now declines to deal with
 	esac
-	if test "$arch" != "lpia"; then
-	    echo deb http://archive.admin.canonical.com/ubuntu $catsuite main
-	else
-	    # lpia lacks *-cat, so abuse i386... although it means unauthenticated pacakges
-	    echo deb http://archive.admin.canonical.com/ubuntu/ dists/$catsuite/main/binary-i386/
-	fi >&6
-	if test -n "$cat"; then
-	    echo deb-src http://archive.admin.canonical.com/ubuntu $catsuite main
+	if test -n "$catsuite"; then
+	    if test "$arch" != "lpia"; then
+		echo deb http://archive.admin.canonical.com/ubuntu $catsuite main
+	    else
+		# lpia lacks *-cat, so abuse i386... although it means unauthenticated pacakges
+		echo deb http://archive.admin.canonical.com/ubuntu/ dists/$catsuite/main/binary-i386/
+	    fi >&6
+	    if test -n "$cat"; then
+		echo deb-src http://archive.admin.canonical.com/ubuntu $catsuite main
+	    fi
+	    cat <<- EOF > $chrootdir/etc/apt/preferences
+			Package: *
+			Pin: release a=$catsuite
+			Pin-Priority: 50
+		EOF
 	fi
-	cat <<- EOF > $chrootdir/etc/apt/preferences
-		Package: *
-		Pin: release a=$catsuite
-		Pin-Priority: 50
-	EOF
-
 	if [ -n "$home" ]; then
 	    addmount /home      $chrootdir/home     none       bind     0  0
 	fi
@@ -634,8 +639,12 @@
 for pkg in $builddep; do
 	echo "apt-get -y build-dep $pkg || true" >&5	# do not care if these install
 done
-if test -n "$rapt"; then
+if test -n "$rapt" -a -n "$catsuite"; then
 	echo "apt-get -y -oAPT::Get::AllowUnauthenticated=true install sudo rapt libnss-db" >&5		# insist on success
+else
+	echo "apt-get -y install sudo libnss-db software-properties-common" >&5		# insist on success
+	echo "add-apt-repository -y -u ppa:canonical-sysadmins/rapt" >&5		# insist on success
+	echo "apt-get -y install rapt" >&5						# insist on success
 fi
 
 if test -z "$buildd"; then