+ echo '====== automated-ec2-builds [/tmp/automated-ec2-builds] ======'
====== automated-ec2-builds [/tmp/automated-ec2-builds] ======
+ cd /tmp/automated-ec2-builds
+ bzr info
Standalone tree (format: 2a)
Location:
  branch root: .

Related branches:
  parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/automated-ec2-builds/
+ bzr version-info
revision-id: ben.howard@canonical.com-20140129230222-bcas7lyb8vvnkl7t
date: 2014-01-29 16:02:22 -0700
build-date: 2014-01-30 07:03:51 +0000
revno: 586
branch-nick: automated-ec2-builds
+ bzr log -p -r-1
------------------------------------------------------------
revno: 586
committer: Ben Howard <ben.howard@canonical.com>
branch nick: automated-ec2-builds
timestamp: Wed 2014-01-29 16:02:22 -0700
message:
  Zero disks after writing. Make UEFI images smaller.
diff:
=== modified file 'build-ec2-image'
--- build-ec2-image	2013-12-09 18:40:22 +0000
+++ build-ec2-image	2014-01-29 23:02:22 +0000
@@ -238,6 +238,11 @@
 	fi
 
 	rootimg="${tmpdest}/root.img"
+
+	# Zero out the free space, to make the image smaller
+	zerofree ${rootimg}
+	sync
+
 	if [ -n "${root_fs_label}" ]; then
 		e2label "${rootimg}" "${root_fs_label}" ||
 			fail "failed to add label ${root_fs_label} to ${rootimg}"

=== modified file 'ovf/part2disk-grubhelper'
--- ovf/part2disk-grubhelper	2014-01-29 21:53:04 +0000
+++ ovf/part2disk-grubhelper	2014-01-29 23:02:22 +0000
@@ -34,6 +34,8 @@
 			umount "${d}"
 		done
 	fi
+
+	[ -z "${part_dev}" ] || { zerofree ${part_dev}; sync; }
 	[ -z "${KPARTX_DEV}" ] || kpartx -d "${KPARTX_DEV}"
 	[ -z "${LO_DEV}" ] || losetup -d "${LO_DEV}"
 	[ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
@@ -145,7 +147,6 @@
 
 chroot "${mp}" ${grub_setup} ${grub_opts}
 
-
 exit
 
 # vi: ts=4 noexpandtab

=== modified file 'ovf/part2disk-grubhelper-uefi'
--- ovf/part2disk-grubhelper-uefi	2014-01-29 22:09:09 +0000
+++ ovf/part2disk-grubhelper-uefi	2014-01-29 23:02:22 +0000
@@ -45,7 +45,7 @@
 		done
 	fi
 
-	[ -z "${part_dev}" ] || zerofree -v ${part_dev}
+	[ -z "${part_dev}" ] || { zerofree ${part_dev}; sync; }
 	[ -z "${KPARTX_DEV}" ] || kpartx -d "${KPARTX_DEV}"
 	[ -z "${LO_DEV}" ] || losetup -d "${LO_DEV}"
 	[ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
@@ -252,6 +252,8 @@
 xchroot sed -i "s,root=.* ,root=LABEL=cloudimg-rootfs ,g"\
    		/boot/grub/grub.cfg
 xchroot dpkg-divert --remove --local --rename /etc/grub.d/30_os-prober
+xchroot apt-get -y clean
+xchroot apt-get -y update
 
 # Some clean-up...
 xchroot rm /etc/mtab
+ echo ''

+ echo '====== ec2-publishing-scripts [/tmp/ec2-publishing-scripts] ======'
====== ec2-publishing-scripts [/tmp/ec2-publishing-scripts] ======
+ cd /tmp/ec2-publishing-scripts
+ bzr info
Standalone tree (format: unnamed)
Location:
  branch root: .

Related branches:
  parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts/
+ bzr version-info
revision-id: ben.howard@canonical.com-20140127230002-ftd616u3zr0w59od
date: 2014-01-27 16:00:02 -0700
build-date: 2014-01-30 07:03:51 +0000
revno: 510
branch-nick: ec2-publishing-scripts
+ bzr log -p -r-1
------------------------------------------------------------
revno: 510
committer: Ben Howard <ben.howard@canonical.com>
branch nick: ec2-publishing-scripts.upstream
timestamp: Mon 2014-01-27 16:00:02 -0700
message:
  Added ppc64el to publicize build
diff:
=== modified file 'publicize-build'
--- publicize-build	2013-04-25 13:53:10 +0000
+++ publicize-build	2014-01-27 23:00:02 +0000
@@ -67,7 +67,7 @@
     url_file="${TEMP_D}/urls.txt"
 
 	local arch ec2_arches="" f="" tarball="" path="" dashed=""
-	local all_arches="armel armhf i386 amd64"
+	local all_arches="armel armhf i386 amd64 ppc64el"
 	ec2_arches=$(awk '-F\t' '{print $6}' "${outfile}" | sort -u)
 	[ -n "${ec2_arches}" ] || ec2_arches="i386 amd64"
 	ec2_arches=$(echo ${ec2_arches}) # carriage return to spaces
+ echo ''

+ echo '====== live-build [/tmp/live-build] ======'
====== live-build [/tmp/live-build] ======
+ cd /tmp/live-build
+ bzr info
Standalone tree (format: 1.9-rich-root)
Location:
  branch root: .

Related branches:
  parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/live-build/cloud-images/
+ bzr version-info
revision-id: ben.howard@canonical.com-20140122231000-sbhpbj7l90886si8
date: 2014-01-22 16:10:00 -0700
build-date: 2014-01-30 07:03:52 +0000
revno: 1869
branch-nick: live-build
+ bzr log -p -r-1
------------------------------------------------------------
revno: 1869 [merge]
committer: Ben Howard <ben.howard@canonical.com>
branch nick: live-build
timestamp: Wed 2014-01-22 16:10:00 -0700
message:
  Added ubuntu-cloud-t and ubuntu-cloud-arm-t for Trusty and later to drop server seed
diff:
=== 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:03:37 +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:03:37 +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	2014-01-22 23:07:03 +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^ 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_binary_virtual-hdd-raw'
--- scripts/build/lb_binary_virtual-hdd-raw	2013-02-14 23:34:33 +0000
+++ scripts/build/lb_binary_virtual-hdd-raw	2013-12-20 01:57:40 +0000
@@ -148,7 +148,7 @@
 rmdir binary-raw.tmp
 
 # Make image more sparse by zero'ing blocks out
-if which zerofree 2> /dev/null &>1; then
+if which zerofree >/dev/null 2>&1; then
     ${LB_ROOT_COMMAND} zerofree binary-raw.img
 fi
 

=== modified file 'scripts/build/lb_chroot_archives'
--- scripts/build/lb_chroot_archives	2013-12-19 23:43:32 +0000
+++ scripts/build/lb_chroot_archives	2013-12-24 06:32:15 +0000
@@ -50,16 +50,11 @@
 
 		# Configure custom sources.list
 
-        if [ "$(dpkg --print-architecture)" = "ppc64el" ]; then
-            cat > chroot/etc/apt/sources.list << EOF
+cat > chroot/etc/apt/sources.list << EOF
 # /etc/apt/sources.list
 
 deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}
-## 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
-        fi
 
 		if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ]
 		then
------------------------------------------------------------
Use --include-merged or -n0 to see merged revisions.
+ echo ''

+ echo '====== vmbuilder-0.11 [/tmp/vmbuilder-0.11] ======'
====== vmbuilder-0.11 [/tmp/vmbuilder-0.11] ======
+ cd /tmp/vmbuilder-0.11
+ bzr info
Standalone tree (format: 2a)
Location:
  branch root: .

Related branches:
  parent branch: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/0.11a/
+ bzr version-info
revision-id: ben.howard@canonical.com-20120605221454-crv9cc4612f907lh
date: 2012-06-05 16:14:54 -0600
build-date: 2014-01-30 07:03:52 +0000
revno: 398
branch-nick: vmbuilder-0.11
+ bzr log -p -r-1
------------------------------------------------------------
revno: 398
committer: Ben Howard <ben.howard@canonical.com>
branch nick: vmbuilder
timestamp: Tue 2012-06-05 16:14:54 -0600
message:
  Fix for allow vmbuilder to run on 12.04 LTS.
diff:
=== modified file 'VMBuilder/plugins/ubuntu/dapper.py'
--- VMBuilder/plugins/ubuntu/dapper.py	2011-05-18 20:49:25 +0000
+++ VMBuilder/plugins/ubuntu/dapper.py	2012-06-05 22:14:54 +0000
@@ -157,18 +157,15 @@
             self.vm.addpkg += ['openssh-server']
 
     def mount_dev_proc(self):
-        run_cmd('mount', '--bind', '/dev', '%s/dev' % self.destdir)
-        self.vm.add_clean_cmd('umount', '%s/dev' % self.destdir, ignore_fail=True)
-
-        run_cmd('mount', '--bind', '/dev/pts', '%s/dev/pts' % self.destdir)
+        run_cmd('mkdir', '-p', '%s/dev/pts' % self.destdir)
+        run_cmd('mount', '-t', 'devpts',  'devpts-live', '%s/dev/pts' % self.destdir)
         self.vm.add_clean_cmd('umount', '%s/dev/pts' % self.destdir, ignore_fail=True)
 
-        self.run_in_target('mount', '-t', 'proc', 'proc', '/proc')
+        run_cmd('mount', '-t', 'proc', 'proc-live', '%s/proc' % self.destdir)
         self.vm.add_clean_cmd('umount', '%s/proc' % self.destdir, ignore_fail=True)
 
     def unmount_dev_proc(self):
         run_cmd('umount', '%s/dev/pts' % self.destdir)
-        run_cmd('umount', '%s/dev' % self.destdir)
         run_cmd('sh', '-c', 'grep -q "$1" /proc/mounts || exit 0; umount "$1"',
                 'umount_binfmt', "%s/proc/sys/fs/binfmt_misc" % self.destdir)
         run_cmd('umount', '%s/proc' % self.destdir)
+ echo ''