359 Commits

Author SHA1 Message Date
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
5da94c05e5 Fixed template omission (found wile running a build withthis branch). 2017-02-16 03:11:06 +01: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
Nish Aravamudan
404e524013 live-build/ubuntu-cpc/hooks/061-open-iscsi.chroot: generate iSCSI
Initiator Name at first iscsid run for cloud images to ensure it is
unique (LP: #1444992).
2017-02-08 18:10:35 -08:00
Steve Langasek
dc38efa4bd merge from trunk 2017-02-08 15:19:54 -08:00
Steve Langasek
60da7e7c43 Also make squashfs skippable with $IMAGE_TARGETS 2017-02-08 15:18:22 -08:00
Steve Langasek
7fc1da1513 * live-build/ubuntu-cpc/functions: don't call sleep as part of
umount_settle; udevadm settle is synchronous and there's no reason to
  sleep after it.
* live-build/ubuntu-cpc/functions: umount_partition: don't call
  umount_settle for each submount; just unmount them one by one and
  settle at the end.
2017-02-08 13:51:36 -08:00
Steve Langasek
97bc634bd9 vmdk-ova has to key on the vmdk image build 2017-02-07 11:58:52 -08: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
5a07ff4602 Roll both switches on $ARCH into one, as suggested at review. 2017-01-17 08:10:26 +00: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
Robert C Jennings
67dfdf94a7 ubuntu-cpc: Remove redundant copy of grub files
This redundant and file names recently changed.  These files will be
put in place by grub-install a few lines below these.
2016-10-27 17:05:20 -05: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
Daniel Watkins
15d147bcdb Add replace_grub_root_with_label function
When update-grub is run, it will detect the disks in the build system.
Currently, we sed the grub configuration in places where this happens;
replace_grub_root_with_label moves that seddery in to a single callable
location to avoid ending up with multiple versions of it.

(It's worth noting that we also do this in 999-cpc-fixes.chroot, but as our
functions file isn't available within the chroot we don't use it there.)
2016-09-02 12:54:19 +01: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
2616af2baf [ Louis Zuckerman ]
* Merged the following changes from upstream
[ Łukasz 'sil2100' Zemczak ]
* Remove the ubuntu-pd project from the scripts
* Add instead an ubuntu-touch-custom project for custom re-builds of
  ubuntu-touch 
[ Daniel Watkins ]
* Consolidate cloud images
  - Remove .tar.gz and .tar.xz (removed in favour of the squashfs).
  - Remove the MBR-only disk image in favour of the shared GPT/MBR UEFI
    image.
  - Remove '-disk1' from bootable image names.
[ Phil Roche ]
* Removed HWCLOCKACCESS=no from /etc/default/rcS (LP: #1581044)
2016-07-06 12:12:36 +00:00
Louis Zuckerman
cad69acf05 fixes for vagrant box builder in ubuntu-cpc 2016-06-24 12:56:22 +00:00
Daniel Watkins
319e3668b9 [cpc][ppc64el] apt-get update before installing grub2 2016-06-09 15:48:38 +01:00
Phil Roche
d97134679d Removed HWCLOCKACCESS=no from /etc/default/rcS
HWCLOCKACCESS=no in /etc/default/rcS is no longer required and prompts a confirmation
dialog on upgrade. (bug 1581044)
2016-06-09 10:47:25 +01:00
Daniel Watkins
c1a36eb3cd Don't ignore failures to find a base VMDK for OVAs
We should always build them, and treat them not existing as a failure.
2016-06-09 10:47:25 +01:00
Daniel Watkins
dd9cf219c7 Create a VMDK image on i386 2016-06-09 10:47:25 +01:00
Daniel Watkins
fe81277a0f Continue producing non-UEFI images on non-UEFI arches 2016-06-09 10:47:25 +01:00
Daniel Watkins
0a8a704b0b Remove '-disk1' from bootable image names. 2016-06-09 10:47:25 +01:00
Daniel Watkins
1fd54c49ee * Consolidate cloud images
- Remove .tar.gz and .tar.xz (removed in favour of the squashfs).
  - Remove the MBR-only disk image in favour of the shared GPT/MBR UEFI
    image.
2016-06-09 10:47:25 +01:00
Daniel Watkins
2c27aab38c Re-enable systemd predictable interface naming in cloud images 2016-04-14 11:06:33 -07:00
Daniel Watkins
6340e292d6 Don't configure the eth0 interface by default
In xenial, eth0 won't exist (as we've moved to systemd's predictable interface
naming), and even were it to exist, cloud-init would handle configuring it on
boot.
2016-04-14 11:03:18 -07:00
Adam Conrad
dbcbcfaf7c live-build/ubuntu-cpc/hooks/032-disk-image.binary: Install s390-tools
and sysconfig-hardware before we attempt to configure zipl.
2016-04-13 05:40:22 -06:00
Adam Conrad
ec84072284 Merge powerpc fixes from Daniel Watkins 2016-04-07 07:42:08 -06:00
Daniel Watkins
2909aba4b5 Enable building of powerpc cloud images. 2016-04-07 14:34:12 +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
Dimitri John Ledkov
d570ecdcb8 Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which
is used outside of the livecd-rootfs build process (specifically for EC2
publication).
2016-02-22 19:17:11 +00: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
Daniel Watkins
6f6fb2834b Refactor ubuntu-cpc hooks to hard-code producing an 'ext4' rootfs, which
is used outside of the livecd-rootfs build process (specifically for EC2
publication).
2016-02-22 11:31:01 +00:00
Adam Conrad
8b77178bc5 live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot: Add fake_cloud_init
function to create a nocloud data source for cloud images that aren't
meant to be used on real clouds and use it by default on armhf+raspi2
2016-02-14 15:34:21 -07:00
Steve Langasek
a545002b7c Mark boot partitions as type vfat 2016-02-12 09:49:17 -08:00
Steve Langasek
b1099d2a64 Import live-build/ubuntu-cpc/hooks/raspi2/mkknlimg from
https://github.com/raspberrypi/linux/blob/rpi-4.1.y/scripts/mkknlimg
and use it to install a bootable uboot.bin.
2016-02-11 23:56:10 -08:00
Steve Langasek
65f74a021d Drop gratuitous call to dpkg 2016-02-11 21:19:09 -08:00
Steve Langasek
a92bf11406 Initial support for raspi2 subarch. 2016-02-10 23:51:54 -08:00
Steve Langasek
246d45c839 And one more 2016-02-10 09:30:48 -08:00
Steve Langasek
c62743e5f4 ...but if we're going to avoid using umount_partition, we need to actually unmount all the mountpoints mounted by setup_mountpoint 2016-02-10 09:29:55 -08:00
Steve Langasek
93314b5882 and the parent directory isn't a mountpoint, so roll back a change that also causes the script to fail. This still warrants refactoring, but let's refactor it in a way that actually works. 2016-02-10 08:26:36 -08:00
Steve Langasek
c53b727a79 But don't try to use the function without declaring the function... 2016-02-10 07:51:55 -08:00
Steve Langasek
7339cb09b3 Remove some code duplication 2016-02-09 14:29:22 -08:00
Steve Langasek
0b279f731b Refactor ubuntu-cpc hooks to always produce a 'plain' rootfs via
live-build and reuse this for the tarball, instead of lb_binary_rootfs
creating some artifact that we ignore / throw away.
2016-02-09 12:22:13 -08:00