1981 Commits

Author SHA1 Message Date
Steve Langasek
9468c51c0f Merge remote-tracking branch 'philroche/bugfix/ubuntu-cpc-LP-2037074-flashkernel-removal' into ubuntu/master 2023-09-27 14:20:14 -07:00
Steve Langasek
e5d3ec78f6 Merge remote-tracking branch 'xnox/X13s' into ubuntu/master 2023-09-27 12:46:01 -07:00
Philip Roche
cf15cc4810 fix: arm flash-kernel removal from ubuntu-cpc project cloud images (LP: #2037074)
With the migration from linux-kvm to linux-virtual/generic for the mantic minimal
images we can now start building arm64 minimal cloud images.

When building initial test images we noticed that the flash-kernel package was being
installed. This is not required for EFI images.

This commit removes the flash-kernel package from the cloud images arm installs

The only images built using the livecd-rootfs ubuntu-cpc project for arm64 and armhf
which are not cloud images (which therefore do not require flash-kernel) are the
raspi images. raspi does require flash-kernel. But the raspi images use the
`ubuntu-server-raspi` task to install the flash-kernel. As such this non raspi
flash-kernel package install can be completely removed.

It also means that initramfs-tools and dracut-install are installed as these are dependencies
of flash-kernel package.
2023-09-27 11:36:51 +01:00
Dimitri John Ledkov
f1ab0f33c8 lowercase
Gbp-Dch: ignore
2023-09-27 00:02:57 +01:00
Dimitri John Ledkov
f3a33b7dce Add support for X13s subarch
Add mapping to use laptop-23.10 kernel. Ensure that
enhanced-secureboot is only setup on amd64 arch.

LP: #2037099

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-09-26 18:54:39 +01:00
Philip Roche
1a884c1427 fix: Ensure that grub/shim package installs do not install recommends for minimized ubuntu-cpc image builds (LP: #2037075)
minimized cloud image policy, introduced in version 23.10.16, is to not install recommends for any package
installs during build. This is to keep the image as small as possible. This also extends to
the grub related packages.

This solves the problems detailed in LP: #2037075 and aligns other arches more with amd64 install of
grub/shim packages for both minimized and non minimized ubuntu-cpc cloud image builds.
2023-09-26 18:08:09 +01:00
Michael Hudson-Doyle
e349c38b77 Merge remote-tracking branch 'simpoir/lp2037338_var_scoping' into ubuntu/master 2023-09-26 15:10:46 +13:00
Simon Poirier
f3114e7fb5 fix: fix var used before declaration in snap_validate_seed
Fix use of variable declared in conditional branch and used in parent
scope in snap_validate_seed. This would affect binary for images without
kernel and using "set -u". (LP: #2037338)
2023-09-25 19:31:58 -04:00
Dan Bungert
ad6f99a9bf budgie: include universe & multiverse 2023-09-25 09:53:48 -06:00
Steve Langasek
0b1caf70c5 Fix the subarch here as well 2023-09-22 10:58:48 -07:00
Steve Langasek
16450169d9 Fix the subarch used in the hook to identify images for sifive unmatched. LP: #2037060. 2023-09-22 10:58:47 -07:00
Utkarsh Gupta
12a2109c22 fix: install LXD snap from stable/ubuntu-<version> channel (LP: #2036725)
In the past, we'd directly snap install lxd which defaults to
the latest/stable channel. However, whilst working on enhancing
unminimize, it was observed that we install this snap from
the stable/ubuntu-<version> channel instead.

This was also noted as a failure when running the CTF tests:
`lxd installed from latest/stable, not stable/ubuntu-23.10`
2023-09-22 13:05:29 +05:30
Philip Roche
a5c5883712 fix: Fix the missing fi with the recent changes in the unminimize script for ubuntu-cpc project (LP: #2036591)
Fixes bug introduced in commit 75db56ce

The missing if statement end `fi` caused build failures due to syntax errors.
2023-09-19 17:02:56 +01:00
Steve Langasek
6820ef310c Merge remote-tracking branch 'toabctl/boot-partition' into ubuntu/master 2023-09-19 08:20:12 -07:00
Utkarsh Gupta
75db56ce61 Merge branch 'enhance-minimize' into ubuntu/master
* enhance-minimize:
  Install linux-virtual to restore the stripped headers
  Enhance unminimize to transform into a base image for ubuntu-cpc
2023-09-19 14:05:13 +05:30
Steve Langasek
9ff1479b4c Merge remote-tracking branch 'vorlon/lp.2036195' into ubuntu/master 2023-09-18 15:06:20 -07:00
Dan Bungert
41fbfd6bb6 desktop: construct minimal+tpmfde variation 2023-09-18 15:48:41 -06:00
Steve Langasek
1deccc2edd The chroot tmpfs mount should only be /var/lib/apt/lists, not /var/lib/apt; the latter breaks changes to /var/lib/apt/extended_states. LP: #2036195. 2023-09-16 17:27:45 -07:00
Philip Roche
8333dbac7a fix: armhf flavour for 6.5+ kernel is now generic (LP: #2033677)
With the introduction of the 6.5 kernel for mantic on 13th September ago we are seeing image build failures
on the armhf builds. The build failure was `No kernel output for generic-lpae!`.

Introduced in the 6.4 kernel and therefore now also in 6.5 there is no generic-lpae flavor anymore. it's just generic now.

As such this commit updates the expected flavour for armhf to generic.
2023-09-15 12:00:15 +01:00
Gauthier Jolly
51d4756700 ubuntu-cpc: increase arm64 image size
This is needed following the addition of the new boot partition. This
also gives us the opportunity to refactor the logic and use a case
statement instead of ifs
2023-09-14 22:18:31 +02:00
Gauthier Jolly
a8b2a9b01e ubuntu-cpc: create a partition for /boot on all UEFI images
In order to support better support Full Disk Encryption on the clouds,
the boot assets have to sit on an un-encrypted partition. We've tried
mounting the ESP on /boot before but it didn't work as /boot has to
support linking for DPKG to work and the ESP has to be FAT.
2023-09-14 09:50:27 +02:00
Gauthier Jolly
626e59b4e5 functions: add support for mounting boot partition
If the partition exists, we should mount it on /boot. Partition 16 was
chosen because it is not used anywhere else in livecd-rootfs yet.
2023-09-14 09:50:27 +02:00
Łukasz 'sil2100' Zemczak
6c608be212 Fix recent build failures by changing kernel/initrd naming and adjust hook conditionals for the minimal layer re-addition. 2023-09-13 11:48:21 +02:00
Sebastien Bacher
ac41893c14 Fix the minimal option for the oem mode config 2023-09-12 12:34:31 +02:00
Sebastien Bacher
faf88cbbe7 Restore a desktop minimal layer and use if by default 2023-09-12 11:11:22 +02:00
Utkarsh Gupta
940df6e060 Install linux-virtual to restore the stripped headers
In a minimized image, the linux headers are stripped, so when
unminimizing it, we should restore those stripped headers
by installing the linux-virtual package.
2023-09-12 12:29:25 +05:30
Utkarsh Gupta
4400dd37c6 Enhance unminimize to transform into a base image for ubuntu-cpc
The unminimize script previously just restored the system documentation
and translations, man pages, and installed ubuntu-minimal and ubuntu-standard
packages to provide the familiar Ubuntu minimal system. But such an image
never became an equivalent of base image.

Upon investigation and looking at how the base image is constructed -
https://git.launchpad.net/livecd-rootfs/tree/live-build/auto/config#n1108 -
we use the following things:
 - minimal task
 - standard task
 - cloud-image task (which involves ubuntu-server)
 - ubuntu-minimal package
 - server task if arch != amd64

OTOH, in the unminimize script, we use the following:
(https://git.launchpad.net/livecd-rootfs/tree/live-build/auto/build#n286)
 - ubuntu-minimal package
 - ubuntu-standard package

So upon running some tests, it was found that if we install ubuntu-server
(with --fix-policy flag), we get the resulting image equivalent to that
of a base image.

cf: https://warthogs.atlassian.net/browse/CPC-3033
2023-09-12 12:29:17 +05:30
Dan Bungert
4c6bb3c386 Merge remote-tracking branch 'dbungert/lp-2026225-surely' into ubuntu/master 2023-09-07 21:31:20 -06:00
Dan Bungert
c00bbf3fb3 desktop: place kernel in the live layer
Placing the kernel in the live layer allows for selecting at install
time which kernel to install.
2023-09-07 16:52:53 -06:00
Dave Jones
7fbe0825b7 Remove spam from boot mountpoint
The pi images contain redundant copies of cmdline.txt and config.txt in
the boot partition mount-point (which get hidden by the *actual* boot
partition). This commit removes those and simplifies the subarch check
(again, +raspi is the only subarch in use at this point on the Raspberry
Pi images)
2023-09-07 10:58:18 +01:00
Steve Langasek
61c1b9bacb Merge remote-tracking branch 'mwhudson/use-server-live-task' into ubuntu/master 2023-09-06 20:04:03 -07:00
Michael Hudson-Doyle
2e1b092a0e auto/config: use the new server-live task to reduce the use of explicit calls to add_package and add_snap a bit. 2023-09-07 12:55:53 +12:00
Steve Langasek
6be1e868f0 Drop live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal/etc/hosts
/etc/hosts in an installed system comes from one of several places:
- the netbase package which ships a sane default
- scripts/casper-bottom/18hostname, which is mostly identical to the netbase
  one but sets a hostname to the flavor name
- the installer which writes one to the target fs
- chroot includes in livecd-rootfs

A chroot include is only needed for images that don't include netbase (so
don't inherit from the minimal seed), don't boot casper, and don't run an
installer.

NONE of these conditions are true for the ubuntu-server live image.  And in
addition, the /etc/hosts here differs from the others.

So, remove it.
2023-09-06 17:55:43 -07:00
Steve Langasek
5a456417d2 Drop code only used for d-i based ubuntu-server images, no longer supported. 2023-09-06 15:40:55 -07:00
Steve Langasek
6d834be1bf More consolidation of duplicate configs 2023-09-06 15:39:55 -07:00
Steve Langasek
86917060b8 Remove dead code: is never 'amd64' 2023-09-06 15:35:40 -07:00
Steve Langasek
65157e0c13 Duplicate if condition 2023-09-06 15:16:01 -07:00
Steve Langasek
cd9c0e4bd7 More consolidation of duplicate configs 2023-09-06 15:13:01 -07:00
Steve Langasek
e501d7ab4c More consolidation of duplicate configs 2023-09-06 14:56:54 -07:00
Steve Langasek
76d133becf Remove unnecessary arch guarding of the UbuntuStudio kernel selection: we only build this image on amd64 (the arch checking is from i386 days), and the lowlatency kernel also exists on arm64. 2023-09-06 14:47:11 -07:00
Steve Langasek
d169cb531c ubuntukylin-default-settings is part of the task, don't hard-code the package. 2023-09-06 14:36:29 -07:00
Steve Langasek
a53fe72235 Drop references to kubuntu-dvd, obsoleted in 2012. 2023-09-06 14:34:36 -07:00
Steve Langasek
7c4ad85509 Merge some more live image definitions 2023-09-06 12:59:40 -07:00
Steve Langasek
214fee87ee generic is the default kernel flavor in live-build on Ubuntu; remove hard-coded cargo-culting of this setting. 2023-09-06 12:56:27 -07:00
Steve Langasek
5776828153 Parameterize and consolidate live image definitions for flavors using a common pattern 2023-09-06 12:04:45 -07:00
Steve Langasek
458f58bb7a Drop references to mythbuntu, obsolete after xenial. 2023-09-06 11:59:32 -07:00
Steve Langasek
f763efa40e Drop references to ubuntu-dvd, obsolete since precise. 2023-09-06 11:53:23 -07:00
Steve Langasek
d7e77d7acf Alphabetize for clarity 2023-09-06 11:49:28 -07:00
Steve Langasek
f2360a58c8 remove redundancy from case statement 2023-09-06 11:48:22 -07:00
Steve Langasek
f44c2aac8c merge redundant cases for seed/mirror handling 2023-09-06 11:43:11 -07:00