+ 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-20140227003750-h4kgms3m7525d8rt date: 2014-02-26 17:37:50 -0700 build-date: 2014-02-27 07:03:56 +0000 revno: 607 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 607 committer: Ben Howard branch nick: automated-ec2-builds timestamp: Wed 2014-02-26 17:37:50 -0700 message: Divert dmidecode on Saucy diff: === modified file 'vmbuilder-cloudimg-fixes' --- vmbuilder-cloudimg-fixes 2014-02-19 23:50:09 +0000 +++ vmbuilder-cloudimg-fixes 2014-02-27 00:37:50 +0000 @@ -145,6 +145,13 @@ exit 0 fi +# dmidecode fix for Saucy +if [[ "${arch}" =~ arm ]]; then + if [ "${codename}" == "saucy" ]; then + xchroot dpkg-divert --local --divert /path/dmidecode --rename --add /bin/true + fi +fi + # ARM images are special if [[ "$arch" =~ (arm|arm64|aarch64) ]]; then + 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-20140220173231-q7q0f9ovmjwxltz7 date: 2014-02-20 10:32:31 -0700 build-date: 2014-02-27 07:03:57 +0000 revno: 529 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 529 committer: Ben Howard branch nick: ec2-publishing-scripts timestamp: Thu 2014-02-20 10:32:31 -0700 message: Use a regex for publish-hvm-image diff: === modified file 'publish-hvm-image' --- publish-hvm-image 2014-02-19 14:53:09 +0000 +++ publish-hvm-image 2014-02-20 17:32:31 +0000 @@ -462,7 +462,7 @@ "${bucket}/${manifest_path}" \ "${register_name[@]}" "${sriov_args[@]}" && \ read junk img_id < "${wdir}/register.${region}.stdout" && - [ "${img_id#???-}" != "${img_id}" ] && { + [[ "${img_id}" =~ "ami-" ]] || { debug 1 $(<"${wdir}/register.${region}.stdout"); errorp "failed to register ${bucket}/${manifest_path}.%s\n" \ "${junk:+ output:${junk} ${img_id}}"; === modified file 'publish-image' --- publish-image 2011-12-16 01:44:20 +0000 +++ publish-image 2014-02-20 17:32:31 +0000 @@ -496,7 +496,7 @@ xc2 create-bucket "$bucket" "$location" >/dev/null || { error "failed to create bucket"; exit 1; } - # note, as found in LP: #428692 comment 10, migrate-image doesn't work + # note, as found in LP: #428692 comment 10, migrate-image doesnt work # for kernel/initrd. So, use publish if [ -z "$mf_bucket" -o "$img_type" != "image" ]; then debug 2 xc2 upload-bundle --bucket "${bucketpath}" \ + 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-20140219235155-8c3dukho0uepwzm3 date: 2014-02-19 16:51:55 -0700 build-date: 2014-02-27 07:03:57 +0000 revno: 1871 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1871 committer: Ben Howard branch nick: live-build timestamp: Wed 2014-02-19 16:51:55 -0700 message: Proper enablement for arm64 diff: === modified file 'functions/defaults.sh' --- functions/defaults.sh 2014-02-17 19:50:17 +0000 +++ functions/defaults.sh 2014-02-19 23:51:55 +0000 @@ -777,7 +777,7 @@ esac ;; - aarch64) + arm64|aarch64) 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-27 07:03:58 +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 ''