1017 Commits

Author SHA1 Message Date
Steve Langasek
cec2e89119 Explicitly add_package linux-$KERNEL_FLAVOURS in Ubuntu Studio. 2023-12-08 18:33:59 -08:00
Steve Langasek
6ce675b57d Project name for Ubuntu Studio needs to be 'ubuntustudio-dvd' throughout, not 'ubuntustudio'. 2023-12-08 15:07:34 -08:00
Steve Langasek
770125af8c Merge branch 'default-locale-everywhere' into ubuntu/master 2023-12-07 21:21:44 -08:00
Steve Langasek
84e27d0de2 Merge branch 'subarch-manifest' into ubuntu/master 2023-12-06 08:40:50 -08:00
Steve Langasek
323ffd735c Also add support for riscv64 builds with 'generic' subarch
CPC team builds use null subarch but ubuntu-cdimage builds use 'generic'
subarch

https://launchpad.net/~ubuntu-cdimage/+livefs/ubuntu/noble/cpc/+build/542136
2023-12-06 08:38:33 -08:00
Steve Langasek
94082a6601 And support riscv64 builds with no subarch
such as https://launchpad.net/~cloudware/+livefs/ubuntu/noble/cpc/
2023-12-06 00:04:28 -08:00
Steve Langasek
573cde58cd Remove *-dvd glob handling for live layers; Ubuntu Studio is the only remaining "DVD" flavor, and with the move to the new installer this bit is also now incorrect. 2023-12-05 21:18:13 -08:00
Steve Langasek
afdd23e548 Fixup: ubuntustudio task name is ubuntustudio-dvd-live, not ubuntustudio-live 2023-12-05 21:14:53 -08:00
Erich Eickmeyer
6d7797eb95 Remove cloud-init, fix add_task line 2023-12-05 15:40:28 -08:00
Erich Eickmeyer
a514428a9c Remove unnecessary lines 2023-12-05 13:12:00 -08:00
Erich Eickmeyer
72746413df Fixes to add minimal seed 2023-12-05 12:48:40 -08:00
Erich Eickmeyer
f668208cf8 Fixes per vorlon 2023-12-05 11:20:20 -08:00
Erich Eickmeyer
154a932dc7 Switch Ubuntu Studio to new installer 2023-12-05 10:28:42 -08:00
Steve Langasek
a2e35e06d8 Merge remote-tracking branch 'simpoir/lp2007419_add_resolved_to_buildd' into ubuntu/master 2023-12-03 21:26:30 -08:00
Steve Langasek
df83a7afed Set C.UTF-8 locale in /etc/default/locale for all images; originally intended to be landed in the cosmic cycle.. 2023-12-03 21:07:54 -08:00
Steve Langasek
5728443d00 Merge remote-tracking branch 'jibel/germinate_with_updates' into ubuntu/master 2023-12-03 19:59:07 -08:00
Ankush Pathak
19bceac8b3 fix: Re-enable universe for pre-installed images (LP: #2044154) 2023-11-21 11:31:06 -05:00
Steve Langasek
8fb2180842 Drop cargo-culted code for "preinstalled" images.
Somewhere along the line, we started trying to add packages to the live
environment of flavor "preinstalled" images.  But:

- we don't build preinstalled images for any flavors
- the preinstalled images for projects like cloud images and wsl are
  explicitly excepted from this code
- the only desktop project we do produce preinstalled images for, Ubuntu
  on Raspberry Pi, uses ubuntu-image for building so this code is never
  reached
2023-11-05 16:14:34 +02:00
Steve Langasek
99d2064f32 Drop a few remaining 'legacy' references. 2023-11-05 15:58:23 +02:00
Steve Langasek
74c1ee4bdf We no longer need to remove ubiquity from the Ubuntu live layer and install ubuntu-desktop-installer, this is now handled via the seeds. 2023-11-04 22:01:02 +02:00
Steve Langasek
5634c7e769 Drop the legacy images for both Ubuntu and Ubuntu Budgie. 2023-11-04 21:56:23 +02:00
Steve Langasek
0a3babb81a call ubuntu-image classic with --debug, because --verbose doesn't give us anything useful in the livefs build logs. 2023-10-11 18:03:30 -07:00
Dan Bungert
2cccd614a6 oem, budgie: kernel in the live layer 2023-10-03 10:43:35 -06:00
Steve Langasek
fadeb495e3 remove ssl-cert "snakeoil" private keys from images, since this makes them not very private. LP: #2037869. 2023-10-02 18:06:26 -07:00
Steve Langasek
fdf0091580 Merge remote-tracking branch 'philroche/bugfix/ubuntu-cpc-project-images-not-producing-all-expected-filelists-LP-2033751' into ubuntu/master 2023-10-02 17:00:28 -07:00
Dimitri John Ledkov
d5e9651fe0 remove live-build/ubuntu/hooks/020-ubuntu-live.binary: handled elsewhere
Now that kernel names use expected -generic flavour, and kernels are
installed in the live layer, we can go back to stock behaviour of
auto/build noticing that binary hooks are called on a live layer and
executing the extraction & rename of the kernel flavours.

BTW we can even later expand that to support 2 generic abis, and
calling the bigger one the hwe generic such that can also remove
./live-build/ubuntu-server/hooks/04-kernel-bits.binary.

This fixes ubuntu arm64+x13s that is unable to find
ubuntu-x13s.kernel-laptop as due to this hook, which currently
produces ubuntu.kernel-generic in error which is not at all expected
by ubuntu-cdimage. Also this unbreaks producing oem & intel-iot
images, although we will build these in 24.04 only next.

This reverts ubuntu daily-live to use `--linux-flavours
laptop-generic-hwe-22.04` instead of `--linux-flavours none
--linux-packages=none --initramfs=none`, like it did in lunar and
pre-canary-image or images that install kernel in live layer.

Fixes: c00bbf3fb3 ("desktop: place kernel in the live layer")

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-10-02 10:39:29 +01:00
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
f9b299ec4d Another arm64 subarch about to land 2023-09-27 13:38:12 -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
Steve Langasek
9fce6428c3 alphabetize the list 2023-09-26 10:18:26 -07:00
Steve Langasek
1f2523920d Add missing '|' 2023-09-26 09:46:16 -07:00
Dan Bungert
ad6f99a9bf budgie: include universe & multiverse 2023-09-25 09:53:48 -06:00
Steve Langasek
cec7b99665 live-build/auto/config: fail immediately on unknown arch/subarch.
When trying to make changes to refactor livecd-rootfs, it is difficult to
know what side effects a change may have because of the use of globs on
arch/subarch and the lack of an authoritative list of supported arch
combinations.

This assembles a list of all possible values for $ARCH:$SUBARCH by looking at
all existing uses of $SUBARCH in live-build/auto/config and combining with
etc/default-arches from ubuntu-cdimage:

$ grep + etc/default-arches |grep -vE '(trusty|xenial|bionic|focal)[[:space:]]|appliance'

It also includes a special-case *appliance* glob, because there are many
Ubuntu Core appliance builds and there may be more in the future, and we
don't want to have to update livecd-rootfs with a hard-coded list.

Otherwise, this includes all currently used / supported combinations.  The
amd64+kassel subarch is referenced in the code, but stopped being built a
while ago because "end of contract"; and there are some older no-longer-used
subarchs for particular raspi variants, which there is work to clean up
separately.  So this should be a no-op wrt buildability of any existing
images on mantic - and if not, that's important for us to know!
2023-09-22 22:34:04 -07:00
Steve Langasek
0b1caf70c5 Fix the subarch here as well 2023-09-22 10:58:48 -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
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
Dan Bungert
41fbfd6bb6 desktop: construct minimal+tpmfde variation 2023-09-18 15:48:41 -06: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
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