Merge lp:~vorlon/live-build/cloud-images-ppc64el into lp:~ubuntu-on-ec2/live-build/cloud-images

[Steve Langasek]

Adjust the ppc64el handling to use the canonical-kernel-team bootstrap ppa,
letting us pull in a kernel package and minimizing the arch-specific delta

[lp:~vorlon/live-build/cloud-images-ppc64el]

1874. By Steve Langasek on 2013-12-24

Bootstrap archive no longer needed, drop the hard-coded special case

=== added directory 'archives'
=== added file 'archives/ppc64el-bootstrap-ppa.chroot'
--- archives/ppc64el-bootstrap-ppa.chroot	1970-01-01 00:00:00 +0000
+++ archives/ppc64el-bootstrap-ppa.chroot	2013-12-24 06:32:30 +0000
@@ -0,0 +1,1 @@
+deb http://ppa.launchpad.net/canonical-kernel-team/bootstrap/ubuntu @DISTRIBUTION@ main
 
=== added file 'archives/ppc64el-bootstrap-ppa.key.chroot'
--- archives/ppc64el-bootstrap-ppa.key.chroot	1970-01-01 00:00:00 +0000
+++ archives/ppc64el-bootstrap-ppa.key.chroot	2013-12-24 06:32:30 +0000
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+mI0ETPbc7gEEANZKYrN9oZwXU/sMVa1If6VO9TyqSuF533/LAyLM5VjGTtS5ugzE
+UqxGAuIhRIRIVzg/Vwe4LN/5ThO1yZxiLzicrd/5b2DtkAYUPede7J38k4sVICFm
+be40s+tA55GIN47ncQ2biNWM64Y5po0U5tOEkbiqkPiF1XBWmNYP1iWlABEBAAG0
+J0xhdW5jaHBhZCBQUEEgZm9yIENhbm9uaWNhbCBLZXJuZWwgVGVhbYi4BBMBAgAi
+BQJM9tzuAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAIVvGXuJKs6qqo
+A/9RlzQ14WjaBzm0r4O22SnRIeZmmZ8edVQ6yOdAU56xC20c/yuiJPu0kRUN/VRg
+P7MfD3k001Zst1qAVde+SxNI77gQSJm8mH6YdbRqnlfelEU+CbQZ9RK0MSg0pmL4
+zqMoZIib+Ez5dMpJhMfBVC7XMxPn6jEzqWR4qpS549wUUA==
+=RJWU
+-----END PGP PUBLIC KEY BLOCK-----
 
=== removed file 'package-lists/ubuntu-cloud-ppc64el'
--- package-lists/ubuntu-cloud-ppc64el	2013-12-19 22:15:30 +0000
+++ package-lists/ubuntu-cloud-ppc64el	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-# /usr/share/live/build/package-lists/ubuntu-cloud - package list for live-build(7)
-
-#include <minimal>
-
-# Tasks
-standard^ server^ cloud-image^
-
-# Packages
-## TODO-ppc64el: the following is the end goal
-## linux-image-virtual landscape-client ubuntu-minimal
-## for now we have ubuntu-minimal expanded minus console-setup
-landscape-client adduser apt apt-utils bzip2 debconf debconf-i18n eject gnupg ifupdown initramfs-tools iproute2 iputils-ping isc-dhcp-client kmod less locales lsb-release makedev mawk net-tools netbase netcat-openbsd ntpdate passwd procps python3 resolvconf rsyslog sudo tzdata ubuntu-keyring udev upstart ureadahead vim-tiny whiptail
 
=== modified file 'scripts/build/lb_chroot_archives'
--- scripts/build/lb_chroot_archives	2013-12-20 01:46:03 +0000
+++ scripts/build/lb_chroot_archives	2013-12-24 06:32:30 +0000
@@ -56,14 +56,6 @@
 deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
 EOF
 
-		# TODO-ppc64el: remove additional archives
-		[ "$(dpkg --print-architecture)" != "ppc64el" ] ||
-			cat >> chroot/etc/apt/sources.list << EOF
-## TODO-ppc64el: get rid of -proposed and the bootstrap archive
-deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-proposed ${LB_PARENT_ARCHIVE_AREAS}
-deb http://people.canonical.com/~ubuntu-archive/bootstrap/ppc64el/ trusty main
-EOF
-
 		if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 		then
 			echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list