+ 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-02-17 23:18:41 +0000 revno: 586 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 586 committer: Ben Howard 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-20140217170132-s02tgn7ckjbihksk date: 2014-02-17 10:01:32 -0700 build-date: 2014-02-17 23:18:41 +0000 revno: 524 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 524 committer: Ben Howard branch nick: ec2-publishing-scripts.hvm timestamp: Mon 2014-02-17 10:01:32 -0700 message: Fail publication on failed HVM registration diff: === modified file 'publish-hvm-image' --- publish-hvm-image 2014-02-17 16:28:44 +0000 +++ publish-hvm-image 2014-02-17 17:01:32 +0000 @@ -464,9 +464,10 @@ debug 1 $(<"${wdir}/register.${region}.stdout") && read junk img_id < "${wdir}/register.${region}.stdout" && [ "${img_id#???-}" != "${img_id}" ] && { - debug 1 $(<"${wdir}/register.${region}.stdout") + debug 1 $(<"${wdir}/register.${region}.stdout"); errorp "failed to register ${bucket}/${manifest_path}.%s\n" \ - "${junk:+ output:${junk} ${img_id}}" + "${junk:+ output:${junk} ${img_id}}"; + exit 1; } debug 1 "registered at ${region}: ${bucket}/${manifest_path} as ${img_id}" ) & + 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-20140217195017-t6ep151p8ma4243c date: 2014-02-17 12:50:17 -0700 build-date: 2014-02-17 23:18:42 +0000 revno: 1870 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1870 committer: Ben Howard branch nick: live-build timestamp: Mon 2014-02-17 12:50:17 -0700 message: Enablement for aarch64 diff: === modified file 'functions/defaults.sh' --- functions/defaults.sh 2013-12-18 23:24:28 +0000 +++ functions/defaults.sh 2014-02-17 19:50:17 +0000 @@ -777,6 +777,10 @@ esac ;; + aarch64) + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" + ;; + ppc64el) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ;; + 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-02-17 23:18:42 +0000 revno: 398 branch-nick: vmbuilder-0.11 + bzr log -p -r-1 ------------------------------------------------------------ revno: 398 committer: Ben Howard 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 ''