+ 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: robert.jennings@canonical.com-20170831183313-9cftzqp6wnzau57y date: 2017-08-31 13:33:13 -0500 build-date: 2017-09-18 21:33:55 +0000 revno: 732 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 732 [merge] committer: Robert C Jennings branch nick: automated-ec2-builds timestamp: Thu 2017-08-31 13:33:13 -0500 message: grub-efi: Remove unnecessary (and incorrect) file copy operations grub EFI files were renamed, which has broken the copy operations. These are unnecessary as the grub-install will perform all of the needed file copies. MP: https://code.launchpad.net/~rcj/vmbuilder/automated-ec2-builds/+merge/329963 [a=rcj][r=cyphermox,fginther] diff: === modified file 'ovf/part2disk-grubhelper.uefi' --- ovf/part2disk-grubhelper.uefi 2015-02-25 23:24:44 +0000 +++ ovf/part2disk-grubhelper.uefi 2017-08-30 20:05:56 +0000 @@ -223,9 +223,6 @@ xchroot apt-get -y update # Install the UEFI bits -xchroot cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed \ - /boot/efi/EFI/BOOT/grubx64.efi - BOOT_D="/boot/efi/EFI/BOOT" # Make sure these modules are always pre-loaded @@ -238,11 +235,6 @@ EOF - -xchroot cp /usr/lib/shim/shim.efi.signed ${BOOT_D}/shimx64.efi -xchroot cp /usr/lib/shim/MokManager.efi.signed ${BOOT_D}/MokManager.efi -xchroot cp /usr/lib/grub/x86_64-efi-signed/grubx64.efi.signed ${BOOT_D}/grubx64.efi - xchroot grub-install /dev/${bn_lodev} \ --boot-directory=/boot \ --efi-directory=/boot/efi \ ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions. + 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: phil.roche@canonical.com-20170918111638-o4o6xcttmw9t5rl3 date: 2017-09-18 12:16:38 +0100 build-date: 2017-09-18 21:33:55 +0000 revno: 656 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 656 [merge] committer: Phil Roche branch nick: ec2-publishing-scripts timestamp: Mon 2017-09-18 12:16:38 +0100 message: cloud-image-manager image registrations should not make public Instead force query data to be generated without making public. diff: === modified file 'ec2-image2ebs' --- ec2-image2ebs 2017-07-28 12:45:44 +0000 +++ ec2-image2ebs 2017-08-16 13:42:44 +0000 @@ -665,7 +665,7 @@ --ebs_storage_type=${ebs_storage_type} \ --region ${region} \ --query-data-directory=${query_data_directory} \ - --public \ + --force-querydata \ --no-debug # read the img_id from the generated query data === modified file 'publish-hvm-image' --- publish-hvm-image 2017-07-28 12:45:44 +0000 +++ publish-hvm-image 2017-08-16 13:42:44 +0000 @@ -453,7 +453,7 @@ --local_file=${rename_full} \ --restrict_to_region ${region} \ --query-data-directory=${query_data_directory} \ - --public + --force-querydata echo "cloud-image-manager register_image query data output ..." ls -al ${query_data_directory} ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions. + 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-20150612123735-zf4q8vxmjb7vaq7w date: 2015-06-12 06:37:35 -0600 build-date: 2017-09-18 21:33:55 +0000 revno: 1884 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1884 committer: Ben Howard branch nick: live-build timestamp: Fri 2015-06-12 06:37:35 -0600 message: Drop kernel from ubuntu-cloud-t-hwe package list; use live build cli to configure diff: === modified file 'package-lists/ubuntu-cloud-t-hwe' --- package-lists/ubuntu-cloud-t-hwe 2015-06-11 22:55:21 +0000 +++ package-lists/ubuntu-cloud-t-hwe 2015-06-12 12:37:35 +0000 @@ -6,4 +6,4 @@ standard^ cloud-image^ # Packages -linux-image-virtual-lts-vivid landscape-client ubuntu-minimal +landscape-client ubuntu-minimal + 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: 2017-09-18 21:33:56 +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 ''