932 Commits

Author SHA1 Message Date
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
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
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
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
Steve Langasek
caace43cb9 ubuntu-unity-live task exists, use it also instead of hard-coded list of packages. 2023-09-06 11:36:18 -07:00
Steve Langasek
fc49fb286c Drop references to ubuntu-netbook, obsolete since Ubuntu 11.04. 2023-09-06 11:32:43 -07:00
Steve Langasek
e8a08ad084 Don't hard-code addition of xterm package on xubuntu, it's in the task already. 2023-09-06 11:28:50 -07:00
Steve Langasek
7c51e152f1 ubuntucinnamon-live task has existed for a while now, use it instead of hard-coded list of packages. 2023-09-06 11:26:58 -07:00
Steve Langasek
abc60bc135 Drop references to kubuntu-plasma5, obsolete since wily 2023-09-06 11:24:06 -07:00
Łukasz 'sil2100' Zemczak
9b33f085c1 Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into canary-as-default 2023-09-05 19:00:32 +02:00
Utkarsh Gupta
78a98c6835 Fix unminimize to correctly list packages (LP: #1996489)
Prior to dpkg/1.21.0, there was a bug where dpkg -V/--verify
couldn't list all the correct packages correctly but with
that being fix and in archive since Jammy, this works perfectly
but the syntax to report the missing files have changed. It
just prints 'missing' now. With that new format, we can now
fix the regex to simply list the packages.

With this patch, the unminimize script works flawlessly
on a minimized image.
2023-09-02 00:39:41 +05:30
Łukasz 'sil2100' Zemczak
3a715d2fff Don't reset KERNEL_FLAVOURS for canary. 2023-08-30 16:47:21 +02:00
Łukasz 'sil2100' Zemczak
0c6e4314e5 canary: switch to use the live task, try to use KERNEL_FLAVOURS instead of a manual kernel add_package. 2023-08-30 11:57:04 +02:00
Michael Hudson-Doyle
6ab6066c05 Use a traditional seed.yaml style seed for the canary installer's live session. 2023-08-28 21:29:24 +12:00
Michael Hudson-Doyle
3d5fd1120c Configure universe sources in canary ISO. (LP: #2033109) 2023-08-28 10:43:52 +12:00
Steve Langasek
d3a75c9bec Consolidate canary layers to merge 'classic' back into 'standard' 2023-08-23 22:21:32 +12:00
Utkarsh Gupta
7b1b63147e Add python3-systemd to our minimized builds
This package is needed by ubuntu-advantage-tools for cloud images
only. u-a-t ultimately will drop this entirely in their next release.
(cf: https://github.com/canonical/ubuntu-pro-client/issues/2692)

So instead of putting this in the seeds and then having to deal
with the seed changes to Mantic (after its release) and SRU of
ubuntu-meta, I'd rather have changes in livecd-rootfs done. Once
python3-systemd dependency is dropped from u-a-t, we'll drop it
from livecd-rootfs in Mantic+, too.
2023-08-22 14:48:33 +05:30
Łukasz 'sil2100' Zemczak
8a9ba050c3 Make canary images default for Ubuntu. 2023-08-18 12:16:28 +02:00
Steve Langasek
94ab5c0f7a Merge branch 'meta-squash-fs' into ubuntu/master 2023-08-17 08:16:49 -07:00