+ 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-20140428193619-hvunf4q1d3hgsmzd date: 2014-04-28 13:36:19 -0600 build-date: 2014-05-28 17:52:48 +0000 revno: 629 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 629 [merge] committer: Ben Howard branch nick: automated-ec2-builds timestamp: Mon 2014-04-28 13:36:19 -0600 message: Merge in of xaatr support diff: === modified file 'img2roottgz' --- img2roottgz 2014-03-12 16:29:28 +0000 +++ img2roottgz 2014-04-28 17:59:33 +0000 @@ -49,7 +49,12 @@ fi slist=( $(shopt -s dotglob && cd "$mp" && ls -d *) ) +attropts=( ) +if tar --help 2>&1 | grep -q xattr; then + attropts=( "--xattrs" "--xattrs-include=*" "--acls" ) +fi tar --use-compress-program=gzip-rsyncable \ + "${attropts[@]}" \ -C "$mp" -Scpf - "${slist[@]}" ' ------------------------------------------------------------ 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: ben.howard@ubuntu.com-20140520224241-jcgzstf9u332a3r1 date: 2014-05-20 16:42:41 -0600 build-date: 2014-05-28 17:52:48 +0000 revno: 556 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 556 committer: Ben Howard branch nick: trunk timestamp: Tue 2014-05-20 16:42:41 -0600 message: Increase wait for HVM to 5/25 minutes diff: === modified file 'publicize-build' --- publicize-build 2014-05-01 13:15:40 +0000 +++ publicize-build 2014-05-20 22:42:41 +0000 @@ -335,11 +335,11 @@ error "Missing ${AMI} in ${region}" try=$((${try} - 1)) if (( ${try} > 0 )); then - error "Sleeping 60 seconds" - sleep 60 + error "Sleeping 5 minutes" + sleep 300 error "Retry #" $((5 - ${try})) else - fail "Unable to find AMI after 300 seconds." + fail "Unable to find AMI after 25 minutes." fi fi done + 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-20140331230745-0qe08186ylyg1pkr date: 2014-03-31 17:07:45 -0600 build-date: 2014-05-28 17:52:49 +0000 revno: 1874 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1874 [merge] committer: Ben Howard branch nick: live-build timestamp: Mon 2014-03-31 17:07:45 -0600 message: Mount dev to work with Trusty PPC64EL images diff: === modified file 'scripts/build/lb_chroot_devpts' --- scripts/build/lb_chroot_devpts 2011-11-28 17:56:01 +0000 +++ scripts/build/lb_chroot_devpts 2014-03-31 22:21:42 +0000 @@ -43,6 +43,8 @@ # Creating lock file Create_lockfile .lock + ${LB_ROOT_COMMAND} mount devtmpfs -t devtmpfs chroot/dev + if [ "${LB_USE_FAKEROOT}" != "true" ] then # Creating mountpoint @@ -76,6 +78,8 @@ fi fi + ${LB_ROOT_COMMAND} umount chroot/dev || true + # Removing stage file rm -f .stage/chroot_devpts ;; ------------------------------------------------------------ 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-05-28 17:52:49 +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 ''