+ 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@ubuntu.com-20140827164253-6axdcz292rwv25k4 date: 2014-08-27 10:42:53 -0600 build-date: 2014-09-24 17:41:48 +0000 revno: 646 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 646 committer: Ben Howard branch nick: trunk timestamp: Wed 2014-08-27 10:42:53 -0600 message: Disable privacy extensions for Trusty and later, LP: #1068756 diff: === modified file 'live-config/common/hooks/060-ipv6.chroot' --- live-config/common/hooks/060-ipv6.chroot 2014-07-01 20:48:40 +0000 +++ live-config/common/hooks/060-ipv6.chroot 2014-08-27 16:42:53 +0000 @@ -6,7 +6,7 @@ codename=$(sh -c 'lsb_release --short --codename') dist_ge() { [[ "$1" > "$2" || "$1" == "$2" ]]; } -if ! dist_ge "${codename}" "utopic"; then +if ! dist_ge "${codename}" "trusty"; then exit 0 fi + 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-20140721234030-va9bci9q4jnlozbm date: 2014-07-21 17:40:30 -0600 build-date: 2014-09-24 17:41:49 +0000 revno: 577 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 577 committer: Ben Howard branch nick: trunk timestamp: Mon 2014-07-21 17:40:30 -0600 message: Removed unneeded debug diff: === modified file 'ec2-image2ebs' --- ec2-image2ebs 2014-07-21 18:53:02 +0000 +++ ec2-image2ebs 2014-07-21 23:40:30 +0000 @@ -573,7 +573,6 @@ # SSDs use the gp2 disk type args[${#args[@]}]="--block-device-mapping" args[${#args[@]}]="/dev/sda1=${snapshot_id}::true:gp2" - args[${#args[@]}]="--debug" ;; *io1) # Provisioned IOPs use io1 + 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-20140822173402-2w4wxk7ws9ge83c7 date: 2014-08-22 11:34:02 -0600 build-date: 2014-09-24 17:41:49 +0000 revno: 1875 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1875 committer: Ben Howard branch nick: live-build timestamp: Fri 2014-08-22 11:34:02 -0600 message: Added the ability to build from -proposed. diff: === modified file 'functions/defaults.sh' --- functions/defaults.sh 2014-02-19 23:51:55 +0000 +++ functions/defaults.sh 2014-08-22 17:34:02 +0000 @@ -828,6 +828,9 @@ ;; esac + # Don't build from proposed by default + LB_PROPOSED="${LB_PROPOSED:-false}" + # Setting package list LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS:-standard}" === modified file 'scripts/build/lb_chroot_archives' --- scripts/build/lb_chroot_archives 2013-12-24 06:32:15 +0000 +++ scripts/build/lb_chroot_archives 2014-08-22 17:34:02 +0000 @@ -146,10 +146,21 @@ then echo "deb-src ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list fi - ;; + ;; esac fi + if [ "${LB_PROPOSED}" = "true" ] + then + echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-proposed ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + + if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] + then + echo "deb-src ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-proposed ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list + fi + + fi + if [ "${LB_VOLATILE}" = "true" ] then echo "deb ${LB_PARENT_MIRROR_CHROOT_VOLATILE} ${LB_PARENT_DISTRIBUTION}-updates ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list === modified file 'scripts/build/lb_config' --- scripts/build/lb_config 2011-11-28 17:56:01 +0000 +++ scripts/build/lb_config 2014-08-22 17:34:02 +0000 @@ -134,6 +134,7 @@ \t [--parent-archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\ \t [--security true|false]\n\ \t [--source true|false]\n\ +\t [--proposed true|false]\n\ \t [-s|--source-images iso|net|tar|hdd]\n\ \t [--swap-file-path PATH]\n\ \t [--swap-file-size MB]\n\ @@ -178,7 +179,7 @@ iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:, net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:, net-cow-server:,net-tarball:,swap-file-path:,swap-file-size:,syslinux-theme:, - username:,win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force, + username:,win32-loader:,source:,proposed:,source-images:,breakpoints,conffile:,debug,force, help,ignore-system-defaults,quiet,usage,verbose,version,bootstrap-qemu-static:,bootstrap-qemu-arch:, bootstrap-qemu-exclude:,root-mount-by:,hdd-fs-label:,hdd-new-fstab,hdd-parts-layout:,hdd-root-part:,no-hdd-bootloader,hdd-formats:" # Remove spaces added by indentation @@ -595,6 +596,11 @@ shift 2 ;; + --proposed) + LB_PROPOSED="${2}" + shift 2 + ;; + --backports) LB_BACKPORTS="${2}" shift 2 @@ -1300,6 +1306,10 @@ # (Default: empty) LB_TASKS="${LB_TASKS}" +# \$LB_PROPOSED: enable proposed updates +# (Default: ${LB_PROPOSED}) +LB_PROPOSED="${LB_PROPOSED}" + # \$LB_SECURITY: enable security updates # (Default: ${LB_SECURITY}) LB_SECURITY="${LB_SECURITY}" + 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-09-24 17:41:50 +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 ''