+ 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-20140110144920-t0m0opvo1sygvp9i date: 2014-01-10 07:49:20 -0700 build-date: 2014-01-11 03:33:54 +0000 revno: 576 branch-nick: automated-ec2-builds + bzr log -p -r-1 ------------------------------------------------------------ revno: 576 [merge] committer: Ben Howard branch nick: automated-ec2-builds timestamp: Fri 2014-01-10 07:49:20 -0700 message: Merge in of changes for interfaces being in /etc/network/interfaces.d diff: === modified file 'conf/trusty-ppc64el-server.conf' --- conf/trusty-ppc64el-server.conf 2013-12-19 23:01:20 +0000 +++ conf/trusty-ppc64el-server.conf 2013-12-27 02:36:20 +0000 @@ -1,6 +1,6 @@ suite="trusty" description="Ubuntu 14.04 LTS (Trusty Tahr)" -copy_out_kernels=0 # TODO-ppc64el: will want to copy out kernels +copy_out_kernels=1 lb_conf=( sudo "LB_BASE=%L" "PATH=%x" "%P/lb_config" "--architecture=%A" @@ -14,9 +14,9 @@ "--distribution=%d" "--hdd-fs-label=%l" "--hdd-new-fstab" "--hdd-size=%s" -# "--linux-flavours=virtual" + "--linux-flavours=virtual" "--mode=ubuntu" -# "--package-list=ubuntu-cloud" + "--package-list=ubuntu-cloud" "--root-mount-by=LABEL" "--source=false" "--system=normal" @@ -26,9 +26,7 @@ lb_conf=( "${lb_conf[@]}" "--apt-options=--force-yes --yes" "--bootstrap-flavour=minimal" - "--linux-flavours=none" - "--linux-packages=none" - "--package-list=ubuntu-cloud-ppc64el" + "--archives=ppc64el-bootstrap-ppa" ) package_img_tgz=0 === modified file 'copy-out-kernels' --- copy-out-kernels 2013-10-29 01:35:13 +0000 +++ copy-out-kernels 2013-12-27 02:18:45 +0000 @@ -50,7 +50,7 @@ # get a list of kernels in /boot : > "${outfile}" -for kfp in ${root_dir}/${bootd}/vmlinuz-*; do +for kfp in ${root_dir}/${bootd}/vmlinu?-*; do [ -f "${kfp}" ] || continue kname=${kfp##*/} iname=initrd.img-${kname#vmlinu?-} === modified file 'live-config/common/hooks/020-pkg-configure.chroot' --- live-config/common/hooks/020-pkg-configure.chroot 2013-12-19 23:01:20 +0000 +++ live-config/common/hooks/020-pkg-configure.chroot 2013-12-21 18:19:24 +0000 @@ -1,11 +1,6 @@ #!/bin/bash # Configure certain packages -## TODO-ppc64el: need console-setup first -case "$(dpkg --print-architecture)" in - ppc64el) exit 0;; -esac - ## console-setup # Select the fontface === modified file 'vmbuilder-cloudimg-fixes' --- vmbuilder-cloudimg-fixes 2013-12-19 23:01:20 +0000 +++ vmbuilder-cloudimg-fixes 2014-01-06 14:31:37 +0000 @@ -107,7 +107,8 @@ if [ "$arch" = "ppc64el" ]; then idir="$rootd/etc/init" sed -e 's/tty1/hvc0/g' "$idir/tty1.conf" > "$idir/hvc0.conf" - sed -i "/getty/s/hvc0$/hvc0 vt102/" "$idir/hvc0.conf" + sed -i "/^exec .sbin.getty/d" "$idir/hvc0.conf" + echo "exec /sbin/getty -L 115200 hvc0 vt102" >> "$idir/hvc0.conf" echo "# written by cloud image build process" >> "$idir/hvc0.conf" exit 0 ------------------------------------------------------------ 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@canonical.com-20131203213059-4xjo40ptjcqwi3mb date: 2013-12-03 14:30:59 -0700 build-date: 2014-01-11 03:33:54 +0000 revno: 508 branch-nick: ec2-publishing-scripts + bzr log -p -r-1 ------------------------------------------------------------ revno: 508 committer: Ben Howard branch nick: ec2-publishing-scripts timestamp: Tue 2013-12-03 14:30:59 -0700 message: Fixed sriov argument diff: === modified file 'publish-build-ebs' --- publish-build-ebs 2013-12-03 21:25:03 +0000 +++ publish-build-ebs 2013-12-03 21:30:59 +0000 @@ -197,7 +197,7 @@ # 2x845G instance-store disks. cc2.8xlarge would get 4. args=( "${args[@]}" --virtualization-type=hvm - "--sriov simple" + --sriov simple --block-device-mapping /dev/sdb=ephemeral0 --block-device-mapping /dev/sdc=ephemeral1 ) ;; + 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: smoser@ubuntu.com-20131224151305-bmod59rrya10oejx date: 2013-12-24 10:13:05 -0500 build-date: 2014-01-11 03:33:54 +0000 revno: 1871 branch-nick: live-build + bzr log -p -r-1 ------------------------------------------------------------ revno: 1871 [merge] committer: Scott Moser branch nick: cloud-images.dist timestamp: Tue 2013-12-24 10:13:05 -0500 message: ppc64el: merge steve's changes to remove some special casing. diff: === added directory 'archives' === added file 'archives/ppc64el-bootstrap-ppa.chroot' --- archives/ppc64el-bootstrap-ppa.chroot 1970-01-01 00:00:00 +0000 +++ archives/ppc64el-bootstrap-ppa.chroot 2013-12-24 06:03:37 +0000 @@ -0,0 +1,1 @@ +deb http://ppa.launchpad.net/canonical-kernel-team/bootstrap/ubuntu @DISTRIBUTION@ main === added file 'archives/ppc64el-bootstrap-ppa.key.chroot' --- archives/ppc64el-bootstrap-ppa.key.chroot 1970-01-01 00:00:00 +0000 +++ archives/ppc64el-bootstrap-ppa.key.chroot 2013-12-24 06:03:37 +0000 @@ -0,0 +1,13 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.15 (GNU/Linux) + +mI0ETPbc7gEEANZKYrN9oZwXU/sMVa1If6VO9TyqSuF533/LAyLM5VjGTtS5ugzE +UqxGAuIhRIRIVzg/Vwe4LN/5ThO1yZxiLzicrd/5b2DtkAYUPede7J38k4sVICFm +be40s+tA55GIN47ncQ2biNWM64Y5po0U5tOEkbiqkPiF1XBWmNYP1iWlABEBAAG0 +J0xhdW5jaHBhZCBQUEEgZm9yIENhbm9uaWNhbCBLZXJuZWwgVGVhbYi4BBMBAgAi +BQJM9tzuAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRAIVvGXuJKs6qqo +A/9RlzQ14WjaBzm0r4O22SnRIeZmmZ8edVQ6yOdAU56xC20c/yuiJPu0kRUN/VRg +P7MfD3k001Zst1qAVde+SxNI77gQSJm8mH6YdbRqnlfelEU+CbQZ9RK0MSg0pmL4 +zqMoZIib+Ez5dMpJhMfBVC7XMxPn6jEzqWR4qpS549wUUA== +=RJWU +-----END PGP PUBLIC KEY BLOCK----- === removed file 'package-lists/ubuntu-cloud-ppc64el' --- package-lists/ubuntu-cloud-ppc64el 2013-12-19 22:15:30 +0000 +++ package-lists/ubuntu-cloud-ppc64el 1970-01-01 00:00:00 +0000 @@ -1,12 +0,0 @@ -# /usr/share/live/build/package-lists/ubuntu-cloud - package list for live-build(7) - -#include - -# Tasks -standard^ server^ cloud-image^ - -# Packages -## TODO-ppc64el: the following is the end goal -## linux-image-virtual landscape-client ubuntu-minimal -## for now we have ubuntu-minimal expanded minus console-setup -landscape-client adduser apt apt-utils bzip2 debconf debconf-i18n eject gnupg ifupdown initramfs-tools iproute2 iputils-ping isc-dhcp-client kmod less locales lsb-release makedev mawk net-tools netbase netcat-openbsd ntpdate passwd procps python3 resolvconf rsyslog sudo tzdata ubuntu-keyring udev upstart ureadahead vim-tiny whiptail === modified file 'scripts/build/lb_chroot_archives' --- scripts/build/lb_chroot_archives 2013-12-20 01:46:03 +0000 +++ scripts/build/lb_chroot_archives 2013-12-24 06:32:15 +0000 @@ -56,14 +56,6 @@ deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS} EOF - # TODO-ppc64el: remove additional archives - [ "$(dpkg --print-architecture)" != "ppc64el" ] || - cat >> chroot/etc/apt/sources.list << EOF -## TODO-ppc64el: get rid of -proposed and the bootstrap archive -deb ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION}-proposed ${LB_PARENT_ARCHIVE_AREAS} -deb http://people.canonical.com/~ubuntu-archive/bootstrap/ppc64el/ trusty main -EOF - if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then echo "deb-src ${LB_PARENT_MIRROR_CHROOT} ${LB_PARENT_DISTRIBUTION} ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list ------------------------------------------------------------ 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-01-11 03:33:55 +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 ''