Mathieu Trudel-Lapierre
46fd6c58f5
Refactor functions out of ubuntu-cpc and ubuntu-server hooks.
8 years ago
Balint Reczey
16eee8d7eb
Use all config hooks from the proper place, not from /build/
8 years ago
Balint Reczey
7cae48fd12
Source ubuntu-cpc functions from the right place
8 years ago
Steve Langasek
738ff116a5
Merge lp:~vorlon/livecd-rootfs/image-flavors/
8 years ago
Brian Murray
f79fc7973c
Add replace_grub_root_with_label function thereby consolidating multiple
...
uses of the same calls to sed. Thanks to Dan Watkins.
8 years ago
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 )
8 years ago
Christopher Glass
5da94c05e5
Fixed template omission (found wile running a build withthis branch).
8 years ago
Christopher Glass
b6e7b22680
Rool both switches into one for all affected files (the vagrant file was still
...
doing two switches on $ARCH).
8 years ago
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 ).
8 years ago
Steve Langasek
60da7e7c43
Also make squashfs skippable with $IMAGE_TARGETS
8 years ago
Steve Langasek
97bc634bd9
vmdk-ova has to key on the vmdk image build
8 years ago
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
8 years ago
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.
8 years ago
Christopher Glass
5a07ff4602
Roll both switches on $ARCH into one, as suggested at review.
8 years ago
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.
8 years ago
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.
8 years ago
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.
8 years ago
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 .
8 years ago
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.)
8 years ago
Steve Langasek
9efc4f0f70
Merge lp:~semiosis/livecd-rootfs/fix-for-1565985
9 years ago
Louis Zuckerman
802e65f885
remove unnecessary virtualbox-guest-dkms package from vagrant image builder
9 years ago
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
9 years ago
Louis Zuckerman
85d3b5fdaf
remove comment from vagrant script
9 years ago
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
9 years ago
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 )
9 years ago
Louis Zuckerman
cad69acf05
fixes for vagrant box builder in ubuntu-cpc
9 years ago
Daniel Watkins
319e3668b9
[cpc][ppc64el] apt-get update before installing grub2
9 years ago
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)
9 years ago
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.
9 years ago
Daniel Watkins
dd9cf219c7
Create a VMDK image on i386
9 years ago
Daniel Watkins
fe81277a0f
Continue producing non-UEFI images on non-UEFI arches
9 years ago
Daniel Watkins
0a8a704b0b
Remove '-disk1' from bootable image names.
9 years ago
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.
9 years ago
Daniel Watkins
2c27aab38c
Re-enable systemd predictable interface naming in cloud images
9 years ago
Adam Conrad
dbcbcfaf7c
live-build/ubuntu-cpc/hooks/032-disk-image.binary: Install s390-tools
...
and sysconfig-hardware before we attempt to configure zipl.
9 years ago
Adam Conrad
ec84072284
Merge powerpc fixes from Daniel Watkins
9 years ago
Daniel Watkins
2909aba4b5
Enable building of powerpc cloud images.
9 years ago
Ben Howard
f3d90d962f
live-build/ubuntu-cpc/hooks/042-vagrant.binary: scope serial device for
...
Virtualbox only.
9 years ago
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).
9 years ago
Ben Howard
eff40b8e5d
live-build/ubuntu-cpc/hooks/042-vagrant.binary: add serial device for
...
Vagrant images (LP: #1546108 ).
9 years ago
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).
9 years ago
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
9 years ago
Steve Langasek
a545002b7c
Mark boot partitions as type vfat
9 years ago
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.
9 years ago
Steve Langasek
65f74a021d
Drop gratuitous call to dpkg
9 years ago
Steve Langasek
a92bf11406
Initial support for raspi2 subarch.
9 years ago
Steve Langasek
246d45c839
And one more
9 years ago
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
9 years ago
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.
9 years ago
Steve Langasek
c53b727a79
But don't try to use the function without declaring the function...
9 years ago
Steve Langasek
7339cb09b3
Remove some code duplication
9 years ago
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.
9 years ago
Dimitri John Ledkov
375554f157
* Chroot to execute zipl, because it's nice.
...
* Use the right loop device to install zipl onto.
9 years ago
Dimitri John Ledkov
8f825a91c9
* Correct initrd.img symlink, kernel/hooks should actually produce the
...
right thing here, but meh.
* Chroot to execute zipl, fails to boot otherwise.
9 years ago
Steve Langasek
6bd644f252
Revert change that adds a *sixth* argument to create_empty_partition; this can't possibly be the cause of whatever problem was being seen
9 years ago
Ben Howard
28c10e02db
ubuntu-cpc: in hooks/030-root-tarball.binary create /lib/modules to fix
...
(LP: 1543204).
9 years ago
Dimitri John Ledkov
21b502d78c
Do not remove linux-base, when purging all the linux-*, in the tarball
...
build. Otherwise ubuntu-minimal is removed, and things get crazy.
9 years ago
Ben Howard
ba1b657624
ubuntu-cpc: fix hooks/032-disk-image.binary call to
...
create_empty_partition, which requires five args due to "-u"
9 years ago
Steve Langasek
90fc765551
set -u damage
9 years ago
Steve Langasek
e51a8f8aef
Make sure we still mount the kernel filesystems in the disk setup
...
We skip the previous unmount/remount behavior because that makes things
unwieldly when there are multiple partitions; but we still have setup to do,
so that /dev is available for grub, etc.
9 years ago
Steve Langasek
eb9b43defe
Don't forget to mark our root partition bootable
9 years ago
Steve Langasek
e9d31ea96a
Fix some thinkos in the loop device name handling
9 years ago
Steve Langasek
4594c28c1f
More set -u damage
9 years ago
Steve Langasek
83d2176957
chroot hooks are special, they don't get the environment because it gets scrubbed by rootcmd; so we have to call dpkg --print-architecture after all
9 years ago
Steve Langasek
b9f96f5682
set -u is a hateful thing
9 years ago
Steve Langasek
0be484d35e
Add support for actually mounting the boot partition and copying contents to it
9 years ago
Steve Langasek
24b9feb58a
further refactoring of partition handling
9 years ago
Steve Langasek
6fce3b879d
-> in a few overlooked places
9 years ago
Steve Langasek
99cdaafd61
Refactor ubuntu-cpc hooks to allow us to handle images where the root
...
partition should not be partition 1.
9 years ago
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.
9 years ago
Steve Langasek
cb58e88614
If a subarch is specified for a cloud image build, don't build rootfs
...
artifacts; these should come from the 'generic' build.
9 years ago
Steve Langasek
691a0ca08f
Add hooks to ubuntu-cpc to divert /bin/sync in the chroot and undivert it
...
at the end. This is a general-purpose change that should be applied to
all flavors and archs, but at the moment it's only needed on armhf+raspi2
to work around the raspberrypi2-firmware postinst calling sync, which is
actually warranted in the normal case.
9 years ago
Ben Howard
a5ee888d1b
ubuntu-cpc: add missing net.ifnames=0 for ppc64el disk images.
9 years ago
Steve Langasek
8e20e4b169
Refactor some non-idiomatic architecture handling in
...
live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
9 years ago
Ben Howard
ca800e778b
* ubuntu-cpc:
...
- fixed loop setup due to change of kpartx output
- only use grub-install logic for Intel architectures
9 years ago
Dimitri John Ledkov
9e06b90ead
* ubuntu-cpc:
...
- exclude s390x from should_install_grub
9 years ago
Daniel Watkins
414cbec4dc
Specify a regex to run-parts so that cloud image extra scripts are found
...
and executed.
9 years ago
Daniel Watkins
e3d6d5dc9f
Set timeout options so ppc64el cloud images don't display a grub boot
...
menu (matching the behaviour of other cloud images).
9 years ago
Daniel Watkins
ece1f6ccab
Install grub in ppc64el cloud images so they are bootable (LP: #1538610 )
9 years ago
Ben Howard
8ff658da8d
Remove unneeded packages from the root.tar.{gz,xz} cloud image targets
...
(LP: #1534764 ).
9 years ago
Ben Howard
fdd9a3e716
Remove unneeded packages from the root.tar.{gz,xz} cloud image targets
...
(LP: #1534765 ).
9 years ago
Daniel Watkins
cf2e1f3cdc
Produce OVA files for i386 cloud builds
9 years ago
Daniel Watkins
c6440fdfe5
Enable building of s390x cloud images.
9 years ago
Ben Howard
421269a732
ubuntu-cpc: clean up qcow2 image builds
...
- use convert_to_qcow2 to create the qcow2
- remove assumption of disk1.img existing
9 years ago
Ben Howard
c6077abaab
ubuntu-cpc: create VMDK's for disk images if they exist. Remove
...
assumption that disk1.img will exist.
9 years ago
Ben Howard
5b08080057
ubuntu-cpc: only execute first level executables in the extra hooks
...
directory
9 years ago
Michael Vogt
c97c00d749
manually merge upload of 2.359
9 years ago
Ben Howard
2f1831ed07
Fix typo in ubuntu-cpc preventing non-intel builds.
9 years ago
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
9 years ago
Ben Howard
1855130ecc
Pre-merge commit
9 years ago
Ben Howard
2b818e8475
Restrict Vagrant size
9 years ago
Ben Howard
9a87b066cf
Comment fixup
9 years ago
Ben Howard
e931fbeaa5
ubuntu-cpc: move vmdk creation code into common funtion to support Vagrant Box builds
9 years ago
Ben Howard
d301f2a532
ubuntu-cpc: add ability add arbitrary hooks for extending builds
9 years ago
Ben Howard
467619d1a1
ubuntu-cpc: generate Vagrant images
9 years ago
Ben Howard
e96df0c156
ubuntu-cpc: generate OVA images.
9 years ago
Ben Howard
92f63b3e6b
ubuntu-cpc: added OVF templates for generating OVA and Vagrant Images
9 years ago
Ben Howard
b31233589e
ubuntu-cpc: generate VMDK disks
9 years ago
Ben Howard
bc5dbaaca5
ubuntu-cpc: generate squashfs based on the rootfs tarball
9 years ago
Ben Howard
e4553137ac
ubuntu-cpc: generate manifest for root tarball
9 years ago