24 Commits

Author SHA1 Message Date
Steve Langasek
738ff116a5 Merge lp:~vorlon/livecd-rootfs/image-flavors/ 2017-02-27 22:34:19 -08:00
Brian Murray
a5cc2033a0 Fix the OVF's metadata to include Ubuntu specific identifiers and
descriptions instead of the generic Linux ones. Thanks to Chris Glass.
(LP: #1656293)
2017-02-16 09:04:07 -08:00
Christopher Glass
b6e7b22680 Rool both switches into one for all affected files (the vagrant file was still
doing two switches on $ARCH).
2017-02-16 01:42:25 +01:00
Steve Langasek
53e1feefdb Per discussion with Adam, don't make this an LB_ variable since it's not actually part of live-build; instead we will look to pass it into the environment through launchpad-buildd 2017-02-07 10:19:03 -08:00
Steve Langasek
8ba3a00622 Support passing IMAGE_FLAVORS in the environment, to limit which images
are output as part of a build; particularly useful for ubuntu-cpc builds
which output multiple image types.
2017-02-06 22:12:32 -08:00
Christopher Glass
f1a8538c8e This branch fixes the OVF's metadata to include Ubuntu-specific identifiers and
descriptions instead of the generic linux ones (lp:1656293).

This applies to both the general image and the vagrant-specific one.
2017-01-16 09:26:25 +00:00
Christopher Glass
f282859477 This branch fixes the manifest generation in OVA files (LP:1627931)
The .ova file extension was passed twice, resulting in file not found errors in
both the general case and the vagrant-specific file creation.
2017-01-16 09:22:55 +00:00
Steve Langasek
8855f05191 live-build/ubuntu-cpc/hooks/042-vagrant.binary: fix unmount handling
so that the teardown is done properly /before/ we try to make an
image from our filesystem, since otherwise /etc/resolv.conf is broken.
LP: #1621393.
2016-09-09 15:56:47 -07:00
Steve Langasek
9efc4f0f70 Merge lp:~semiosis/livecd-rootfs/fix-for-1565985 2016-07-21 09:14:49 -07:00
Louis Zuckerman
802e65f885 remove unnecessary virtualbox-guest-dkms package from vagrant image builder 2016-07-21 13:24:53 +00:00
Louis Zuckerman
213c3b317c updated per Steve Langasek's feedback:
- put umount in trap
- wrap comment lines at 78 chars
- remove unnecessary DEBIAN_FRONTENT env var from apt-get lines
2016-07-11 23:11:27 +00:00
Louis Zuckerman
85d3b5fdaf remove comment from vagrant script 2016-07-07 13:12:01 +00:00
Louis Zuckerman
0eac70b33e [ Louis Zuckerman ]
* Fixes for vagrant box builder in ubuntu-cpc LP: #1565985
* Remove extra packages added on 24 Jun 2016 except virtualbox-guest stuff
* Add cloud-init config to manage /etc/hosts for localhost
2016-07-06 13:54:37 +00:00
Louis Zuckerman
cad69acf05 fixes for vagrant box builder in ubuntu-cpc 2016-06-24 12:56:22 +00:00
Daniel Watkins
0a8a704b0b Remove '-disk1' from bootable image names. 2016-06-09 10:47:25 +01:00
Ben Howard
f3d90d962f live-build/ubuntu-cpc/hooks/042-vagrant.binary: scope serial device for
Virtualbox only.
2016-02-22 15:57:38 -07:00
Ben Howard
eff40b8e5d live-build/ubuntu-cpc/hooks/042-vagrant.binary: add serial device for
Vagrant images (LP: #1546108).
2016-02-22 07:30:03 -07:00
Steve Langasek
7ec8dd87ac Fix architecture handling in hooks. We know we're always being invoked
from a launchpad-buildd-like setup, which passes ARCH and SUBARCH in the
environment, because auto/config and auto/build both rely on this.  So
don't scatter dpkg --print-architecture calls throughout, especially
when many of these are not cross-build-aware.
2016-02-05 23:39:56 -08:00
Ben Howard
2f1831ed07 Fix typo in ubuntu-cpc preventing non-intel builds. 2015-11-17 09:50:10 -07:00
Ben Howard
dd371c4a69 * added additional CPC build targets:
- added manifest generation for squashfs and root.tar.gz
  - added VMDK generation
  - added OVA generation from VMDK's
  - added generic Vagrant image generation
2015-11-13 08:13:51 -07:00
Ben Howard
1855130ecc Pre-merge commit 2015-11-13 08:09:26 -07:00
Ben Howard
2b818e8475 Restrict Vagrant size 2015-11-12 17:56:02 -07:00
Ben Howard
e931fbeaa5 ubuntu-cpc: move vmdk creation code into common funtion to support Vagrant Box builds 2015-11-12 17:21:33 -07:00
Ben Howard
467619d1a1 ubuntu-cpc: generate Vagrant images 2015-11-12 14:51:48 -07:00