958 Commits

Author SHA1 Message Date
Łukasz 'sil2100' Zemczak
6a0fa4f6d4 Export the payload model-assertion as well. 2024-01-30 15:57:15 +01:00
Łukasz 'sil2100' Zemczak
ada09ac429 Get back to using 2 layers, properly handle the install catalogue. 2024-01-26 14:55:33 +01:00
Łukasz 'sil2100' Zemczak
2c73b8c7fb Whoops, removed the add_task call. 2024-01-26 14:12:40 +01:00
Łukasz 'sil2100' Zemczak
1274f6bdd1 Attempt to export the autoinstall file as well. 2024-01-26 12:49:33 +01:00
Łukasz 'sil2100' Zemczak
f8bcf0174c Try switching back to only using one layer. Fix up the catalog naming. 2024-01-26 12:32:44 +01:00
Łukasz 'sil2100' Zemczak
c73bc63c97 The payload should be exported to a different directory. 2024-01-22 15:43:39 +01:00
Łukasz 'sil2100' Zemczak
b22e4e3215 Return to the previous directory after building the payload. 2024-01-22 13:16:45 +01:00
Łukasz 'sil2100' Zemczak
bc93ca4440 Layered images are complicated. Split out live to minimal and live for core, even if it doesn't make much sense. 2024-01-19 16:16:10 +01:00
Łukasz 'sil2100' Zemczak
ec04c653ee Temporarily add printing out lines for the build script. 2024-01-19 15:47:30 +01:00
Łukasz 'sil2100' Zemczak
14301d4c9d Set LIVE_PASSES manually and install ubuntu-image. 2024-01-19 15:13:54 +01:00
Łukasz 'sil2100' Zemczak
aa27044518 A minor tweak to the build of core-desktop. 2024-01-19 15:05:47 +01:00
Łukasz 'sil2100' Zemczak
cade6ef3b6 Work in progress for making iso images for the core-desktop installer. 2024-01-19 12:53:48 +01:00
Łukasz 'sil2100' Zemczak
30418f67ce Some updates to the core-desktop builds. 2023-11-03 09:05:00 +02:00
Łukasz 'sil2100' Zemczak
381d71e418 Fix typos in filenames and shell. 2023-10-29 22:34:49 +02:00
Łukasz 'sil2100' Zemczak
493b2f0717 Provide the model-assertion as well. 2023-10-29 22:26:37 +02:00
Łukasz 'sil2100' Zemczak
2b4a404854 Change position of the payload assets. 2023-10-29 22:24:08 +02:00
Łukasz 'sil2100' Zemczak
e4ad5b793b Use ubuntu-image from edge by default here. 2023-10-27 15:38:12 +02:00
Łukasz 'sil2100' Zemczak
75d2250bf9 More verbosity, change the filename of the payload assertion. 2023-10-27 14:40:25 +02:00
Łukasz 'sil2100' Zemczak
4c458db079 Initial test version of the experimental ubuntu-core-desktop build pipeline. 2023-10-27 14:27:02 +02: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
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
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