80 Commits

Author SHA1 Message Date
Łukasz 'sil2100' Zemczak
e760da3284 When adding the new RISC-V platforms, some of the generic non-SUBARCH code went missing and some invalid assumptions have been made, causing cloud images to fail building. 2022-07-29 17:44:33 +02:00
Alexandre Ghiti
17e659ddf8 riscv: Fix SiFive Unmatched build
While merging the VisionFive support, we removed the installation of
u-boot-menu for the Unmatched by mistake: fix this by reinstating it.

Fixes: ce9f5caccadf ("riscv: Add support for StarFive VisionFive")
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
2022-07-25 09:36:43 +02:00
Alexandre Ghiti
00f35ae9bf riscv: Use FK_FORCE_CONTAINER to force flash-kernel to run in a container
As explained in LP: #1980929, we need this in order to build RISC-V
images.

Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
2022-07-11 12:47:16 +02:00
Alexandre Ghiti
7a1b5f67dd disk-image-uefi.binary: Fix wrong parenthesis
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
2022-07-08 15:00:05 +02:00
Alexandre Ghiti
42b68d5d0f riscv: Bump image size to 4.5G
3.5G is not enough for riscv64 preinstalled as the creation of the initrd fails
with the following error:

Creating config file /etc/default/grub with new version
Processing triggers for initramfs-tools (0.140ubuntu13) ...
update-initramfs: Generating /boot/initrd.img-5.15.0-1011-generic
zstd: error 25 : Write error : No space left on device (cannot write compressed block)
E: mkinitramfs failure zstd -q -1 -T0 25
update-initramfs: failed for /boot/initrd.img-5.15.0-1011-generic with 1.
dpkg: error processing package initramfs-tools (--configure):
 installed initramfs-tools package post-installation script subprocess returned error exit status 1

Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
2022-07-05 11:40:24 +02:00
Alexandre Ghiti
74e9088bbc riscv: Use UEFI bootflow for the Nezha Board
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
2022-07-05 11:40:24 +02:00
Alexandre Ghiti
6224b11fc0 riscv: Add support for StarFive VisionFive
The image created uses a UEFI bootflow, so we install grub for this board
only. We also need flash-kernel to install the dtb where grub can find
it.

This image is specifically architectured so that it can be installed on
a "factory" board, meaning using the u-boot firmware which was
originally implemented for Fedora, so we need the p3 partition that
embeds a uEnv.txt file to tell u-boot what/where to load next stage.

Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
2022-07-05 11:40:24 +02:00
Alexandre Ghiti
f751ff7218 RISC-V: enable building for Nezha board
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-07-05 11:40:24 +02:00
Heinrich Schuchardt
46711a9af6 riscv: define partitioning scheme for Nezha board
Define the image layout for the Nezha board.

The U-Boot SPL based boot0 may be installed starting in sector 16 or 256.
As sector 16 is incompatible with GPT partitioning use sector 256.

The primary U-Boot image is expected to start at sector 32800 and its
backup in sector 24576.

Cf. https://linux-sunxi.org/index.php?title=Allwinner_Nezha&oldid=24469

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2022-07-05 11:40:24 +02:00
Simon Poirier
3da8e81bf2 fix: VMware cdrom OVF import requires to be on IDE
This reverts part of a change causing regression with vmware import due to the
cdrom getting moved to SCSI while shifting controller IDs. (LP: #1970795)
2022-06-11 13:17:48 -04:00
John Chittum
5c8aa8447e
fix: move Vagrant 22.04+ to ephemeral ed25519 key
LP: 1969664 tracks an issue related to the deprecation of rsa+ssh on
Jammy+ openssh server, coupled with upstream vagrant bugs, that cause
Jammy vagrant images fail to bootstrap due to ssh negotiation issues.
Moving to a different key algo from the upstream insecure key matches
Jammy's expectations, and works with older vagrant versions.

vagrant >= 2.2.16 hosts are unaffected by the issue, as an upstream
change was made. This change keep compatibility with newer vagrant
versions as well.
2022-04-21 09:13:37 -05:00
Jean-Baptiste Lallement
c4cb3570a5 Readd ubuntu-cpc/wsl.binary hook
Readding this file per reviewer's request until CPC splits the
pipelines. Removing this file would make CPC image builds fail.

Co-authored-by: Didier Roche <didrocks@ubuntu.com>
2022-03-21 12:19:30 +01:00
Jean-Baptiste Lallement
80ccea8d63 Separate WSL from CPC
Create a separate WSL image than CPC so it can be managed independently.

Co-authored-by: Didier Roche <didrocks@ubuntu.com>
2022-03-17 10:11:39 +01:00
Ivan Kapelyukhin
b40ce74fd6
perf(cpc): split disk-image-uefi out of disk-image series file
Due to how `disk-image` file is structured, it builds BIOS and UEFI
images at the same time. However, certain images (e.g., GCE images)
require only UEFI image to be built, BIOS image is being simply
discarded. This results in longer build times.

Splitting out `disk-image-uefi` would allow images to use it instead of
`disk-image` and thus avoid building unused BIOS images.

`disk-image` now depends on `disk-image-uefi` for backward
compatibility.
2022-03-03 15:44:01 +01:00
Łukasz 'sil2100' Zemczak
32b54e6242 Merge branch 'partalign' of https://git.launchpad.net/~xypron/livecd-rootfs into ubuntu/master 2021-12-16 12:25:05 +01:00
Brian Murray
fe662c5c8a Merge remote-tracking branch 'jessica-youjeong/111721-ubuntu-master-ova' into ubuntu/master 2021-12-15 10:06:54 -08:00
Heinrich Schuchardt
b6701e556f riscv64: ensure reasonable partition alignment
Currently the RISC-V preinstalled server images come with partitions that
are only 1 KiB aligned. Ext4 may use 4 KiB block size. The existing
misalignment leads to decreased performance.

Decrease the size of the loader2 partition by 34 512-byte blocks. This
results in 1 MiB alignment of the EFI and root partitions.

The remaining loader2 partition size of close to 4 MiB is still large
enough for U-Boot or a future EDK II.

Fixes: a808b28d47ec ("riscv64: build preinstalled riscv64 image with uboot SPL and CIDATA.")
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2021-12-01 18:22:02 +01:00
Thomas Bechtold
1a7e9ca8c9 Bump UEFI disk image size for armhf to 3.5 GB
Current jammy builds fail with:
dpkg: error processing archive /var/cache/\
  apt/archives/grub-common_2.04-1ubuntu48_armhf.deb (--unpack):
cannot copy extracted data for './usr/share/grub/unicode.pf2' \
  to '/usr/share/grub/unicode.pf2.dpkg-new': \
  failed to write (No space left on device)
2021-11-23 11:30:47 +01:00
Jess Jang
a97e98c968 Change serial0 allocation as false (LP:#1895104)
It hangs during booting when upgrading hardware
version ESXi after deploying image in groovy.
(Current default version is 10)
It could be resolved by adding serial port in VM
when vm version is larger than 10.

Seriaol port1 has been configured as default so
we need to change setting serial0 as false.
2021-11-17 07:50:19 -06:00
Didier Roche
6a05e7fa22 Install desired already seeded snap in wsl.
As wsl is an image target of ubuntu-cpc, the base seed is hardcoded to
ubuntu-server instead of wsl one. For now, add it, as for the other
cpc images, in hooks.
2021-11-05 17:51:52 +01:00
Chloé Smith
ffab8ceac4
Add a serial port to OVF template (LP: #1895104)
groovy hangs during boot on ESXi when the version is greater than
10. Adding a serial port by default fixes this specific bug - increasing
the HW version will be for another branch.

This is because more investigation is needed into whether it is possible to
increment ddb.virtualHWVersion without disrupting Oracle VirtualBox images.
2021-06-21 21:29:47 +01:00
Dimitri John Ledkov
d5a8116428
Add support for generic preinstalled images. LP: #1923832 2021-04-26 11:04:37 +01:00
Dimitri John Ledkov
4428dbbf8f
riscv64: generalise slightly how preinstalled server images are built, to allow using subarch to pick u-boot binaries to install. 2021-03-11 17:08:15 +00:00
Gauthier Jolly
76330897dc ubuntu-cpc: make /etc/fstab consistent with other ubuntu images
Modify the mount options in fstab to make the Cloud images consistent
with the default we have elsewhere.

LP: #1902103
LP: #1881006
2021-03-02 14:21:36 +00:00
Łukasz 'sil2100' Zemczak
1b0212a76c Use the full name of the 'boot' flag in parted calls 2021-02-24 12:58:08 +01:00
Dimitri John Ledkov
53b28d5f58
esp: perform fsck.
LP: #1912835
2021-01-22 19:16:47 +00:00
Dimitri John Ledkov
7c760864fd
esp: install grub in ubuntu bootloader id path, instead of removable.
Do not use removable uefi bootloader path in the cloud-images by
default, as that prevents upgrades of the bootloader.

LP: #1912830
2021-01-22 19:09:25 +00:00
Dimitri John Ledkov
6746d9fbd9
disk-image-uefi: fix riscv64 subarch user-data. 2020-12-08 09:15:09 +00:00
Dimitri John Ledkov
4881f5260a
qcow2-image: unbreak builds without subarch. 2020-12-05 15:17:16 +00:00
Dimitri John Ledkov
3e1e76b94a
riscv64: fixup subarch build, unbound variable 2020-12-03 16:17:32 +00:00
Dimitri John Ledkov
a808b28d47
riscv64: build preinstalled riscv64 image with uboot SPL and CIDATA. 2020-12-01 17:14:40 +00:00
Dimitri John Ledkov
3962f4ac23
disk-image-uefi: riscv64 add ubuntu:ubuntu login, without expiry. 2020-11-24 18:40:40 +00:00
Dimitri John Ledkov
da578b2c6b
disk-image-uefi: riscv64 add u-boot spl
LP: #1905274
2020-11-24 18:40:34 +00:00
Dimitri John Ledkov
914997827d
disk-image-uefi.binary: build riscv64 image without a bootloader.
We want GPT image with ESP, however there is no bootloader for it
yet. Build without it.
2020-11-19 15:47:12 +00:00
Dimitri John Ledkov
122364df65
disk-image-uefi.binary: enable secureboot on the arm64 image. 2020-11-19 15:47:09 +00:00
Dimitri John Ledkov
e8f53aabdf
disk-image.binary: however still build MBR image on amd64.
It is used to derive vagrant and ec2 images. I do wonder, if those
could be converted to derive from uefi one.
2020-11-18 00:09:08 +00:00
Dimitri John Ledkov
8e548f37d9
disk-image.binary: skip building MBR image on riscv64. 2020-11-17 23:40:53 +00:00
Dimitri John Ledkov
ff175e3f4a
disk-image.binary: actually skip building MBR image on EFI platforms.
The case is for arch:subarch combo, not just arch alone even if
subarch is empty. Thus currently on adm64/arm64/armhf ubuntu-cpc
builds mbr image is created and then ignored, as the convert to qcow2
hook prefers the uefi image whenever available.

Skipping building these correctly, should speed up the build a little
bit and use slightly less disk space.
2020-11-17 23:37:52 +00:00
Dimitri John Ledkov
e2fd168f50
amd64: always install grub-pc with shim-signed
shim-signed depends on grub-efi-amd64-signed, which in turn has
alternative depends on either `grub-efi-amd64 | grub-pc`. However to
support booting with either via shim&signed-grub and BIOS, the choice
must be made to install grub-pc, not grub-efi-amd64.

This makes images consistent with Ubuntu Deskop, Live Server, buildd
bootable images; all of which already do install grub-pc and
shim-signed.

LP: #1901906
2020-10-28 22:56:31 +00:00
Joshua Powers
b0c8b628b2
ubuntu-cpc: only install shim-signed, run autoremove
The CPC build hooks for amd64 incorrectly attempt to install shim-signed
in addition to grub-efi-amd64 and grub-pc. These latter two packages
conflict with each other. Instead shim-signed should install whatever
packages are required.

Additionally, this will ensure that autoremove is run after installing
anything in the CPC build hooks. This is done to avoid shipping images
that include packages that are autoremovable. This will clean-up as
packages are installed and detect any breakage at build time.
2020-10-26 11:48:24 -07:00
John Chittum
1abc43a2d0
Remove virtualbox-guest-utils (LP: #1895862)
virtualbox-guest-utils kernel modules is included in linux-modules
starting in kernel 5.4.0-33 in focal-updates. The vagrant hook also
explicit installed virtualbox-guest-utils. An error occurred with the
version installed from the archives, however, with the inclusion in
linux-modules, there's no need to explicitly install
virtualbox-guest-utils. Removes the code for the explicit install.
2020-09-29 11:41:05 -05:00
Robert C Jennings
2be2a168ee
ubuntu-cpc: Fix spelling in vagrant file 2020-09-16 08:48:28 -05:00
John Chittum
fb33fe9026
Minor fixes to Vagrantfile comments 2020-08-27 15:46:36 -05:00
John Chittum
cfd43992a8
Reorder comments to ensure clarity
Long history comment moved to the end with short clarifying comments
before the relevant code. Update changelog with proper attribution
2020-08-27 15:11:15 -05:00
John Chittum
c92e885303
ubuntu-cpc: Vagrant Serial to Null (LP: #1874453)
Original fix proposed by Stanislav German-Evtushenko (giner)

CPC Ubuntu cloud images default to enabling a serial console connection
via the kernel commandline option `console=ttyS0`. Many clouds support
the serial connection, and utilize it for debugging purposes. Virtualbox
supports the serial connection as well. In Bionic and earlier images,
Vagrant boxes created a serial log file in the directory of the
Vagrantfile by default. However this is not standard behaviour for
Vagrant images, and so it was removed in Eoan onwards.

Starting in Eoan, there were reports of image booting slowdown (1874453
is a single example). After testing, it was determined that the serial
connection starting, without a device attached, was the cause of the
slow down. However, we did not want to revert to the old functionality
of creating a file. Much thanks to <giner> for providing the Ruby syntax
for sending to File::NULL.

This option will not create a local file, however, the default
Vagrantfile configuration is overwritable via a users Vagrantfile. The
original syntax for creating a file local to the users Vagrantfile has
been included as an example.
2020-08-27 14:37:40 -05:00
Stanislav German-Evtushenko
b0144d3018
vagrant: Use dummy file for the console output
Links:
- https://bugs.launchpad.net/cloud-images/+bug/1874453
2020-08-27 14:36:22 -05:00
Steve Langasek
37f5f8881f Revert "Revert "Remove fstab from squashfs images""
This reverts commit d9de2701897608710ed97e206ee29f28af8cc82a.
2020-08-27 12:17:22 -07:00
Robert C Jennings
2844aa530d
Revert ubuntu-cpc: Disable boot splash
These introduced a regression for ppc64el and needs more time to bake.
This reverts commits 1deb0c68e8be6b06190402e32292c3c55134eee2 &
6dbb30f53bd3f2086021abdecaee04645c9ccda0.

 * "ubuntu-cpc: Fix ppc64el grub console update"
 * "ubuntu-cpc: Disable boot splash in all cloud images (LP: #1725358)"
2020-08-12 16:49:41 -05:00
Robert C Jennings
1deb0c68e8
ubuntu-cpc: Fix ppc64el grub console update
The commit 6dbb30f5 (2.682) which disabled boot splash for all cloud
images introduced an error in the ppc64el hook.  This patch corrects the
name of the variable that contains grub console overrides.  The error
seen during testing was
 'disk-image-ppc64el.binary: line 44: CONSOLES: unbound variable'
and this was due to a typo.
2020-08-12 13:48:03 -05:00
Steve Langasek
d9de270189 Revert "Remove fstab from squashfs images"
This reverts commit f96e874ed12e7e080111d27aa14c4f97aa6bec87.
2020-08-12 11:35:06 -07:00