2002 Commits

Author SHA1 Message Date
Łukasz 'sil2100' Zemczak
b1a118f4d7 Update canary model assertions.: 2023-08-22 17:15:36 +02: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
9d9a68d6bf Fix the 020-canary-* hooks referencing the wrong layer names after changes introduced in 23.10.17. 2023-08-18 18:00:24 +02:00
Łukasz 'sil2100' Zemczak
6eca613644 Refresh the canary model assertions. 2023-08-18 17:50:56 +02:00
Ł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
Philip Roche
a373fb527c fix: Install required package fuse3 when preseeding snaps (LP: #2031640)
fuse3 was previously installed through recommends but with minimized images we no longer install recommends packages.

It is only required when preseeding snaps so does not need to be present in all minimized images so does not
need to be in the cloud-minimal seed.
2023-08-17 11:50:20 +01:00
Philip Roche
294a65452d fix: Ensure required dependencies are installed before trying grub-install (LP: #2031640)
As a result of not installing recommended packages the packages required to run `grub-install`
are no longer installed by default.

To ensure we can successfully run `grub-install` we install both `grub-pc` and `grub2-common`
packages.
2023-08-17 11:49:11 +01:00
Philip Roche
711c5c291f fix: Remove dangling symlink /boot/initrd.img.old if exists (LP: #2031640)
As a result of not installing recommended packages we have dangling symlink `/boot/initrd.img.old`

As per the preceding `/boot/initrd.img` cleanup. Cleanup of `/boot/initrd.img.old`
only happens if it is a dangling symlink.

These `rm` commands also have `--verbose` flags now to make it easier when debugging logs
2023-08-17 11:48:22 +01:00
Philip Roche
d1ec6f8947 fix: Do not install recommends for ubuntu-cpc minimized project (LP: #2031640)
For minimized images we do not want to install any recommended packages.
We can do this by setting APT::Install-Recommends to false in apt config
or by passing --no-install-recommends to apt-get install.
2023-08-17 11:46:59 +01:00
Utkarsh Gupta
75e67290b6 Merge remote-tracking branch 'hammerstefan/fix-armhf' into ubuntu/master
* hammerstefan/fix-armhf:
  fix(armhf): Fix armhf kernel file detection
2023-08-17 07:06:15 +05:30
Steve Langasek
6f1fc57ebc Merge the minimal and standard layers on the Ubuntu Desktop images (both daily-live and canary), now that there is no separate minimal install target. 2023-08-16 14:35:27 -07:00
Dan Bungert
e03d43e069 canary: drop minimal install source 2023-08-15 18:03:45 -06:00
Dan Bungert
16c1c3499e canary: fix lang layers generation 2023-08-15 18:03:27 -06:00
Dan Bungert
2d33c8de61 canary: fix layer for "classic" variation 2023-08-15 18:01:44 -06:00
Dan Bungert
592f753e26 canary: +dctrl-tools, subiquity uses it 2023-08-15 18:01:12 -06:00
Stefan Hammer
08db5c2418 fix(armhf): Fix armhf kernel file detection
Armhf images install the `generic-lpae` kernel, while other ARCHes use the
standard `generic` kernel when building the "virtual" image flavour.
Code was looking for a kernel binary ending with -generic in armhf
builds, and failed. Add a special condition to handle armhf builds'
kernel ending with `generic-lpae`

References:
[1] https://bugs.launchpad.net/cloud-images/+bug/2029527
2023-08-09 10:09:22 -05:00
Jess Jang
5e96ff013e fix: bind correct apparmor feature for validating snap seed
During Realtime kernel image build, there was an error during
validating snap seed which derivative images copied 5.19
apparmor feature and can't validate when Realtime kernel (5.15)
installed [0].

To prevent this, bind correct apparmor feature with kernel
version.

[0] https://bugs.launchpad.net/ubuntu/+source/livecd-rootfs/+bug/2024639

(cherry picked from commit 6b54faa6be6286017eb2dc701534cf780ae462ce)
2023-08-08 10:12:27 -05:00
Utkarsh Gupta
7647b027b9 Merge branch 'drop-more-packages' into ubuntu/master
* drop-more-packages:
  Avoid purging packages for ubuntu-cpc
2023-08-08 15:44:33 +05:30
Utkarsh Gupta
ca84320688 Avoid purging packages for ubuntu-cpc
With the switch to the ubuntu-cloud-minimal seed, we
don't really need to purge anything now. On the contrary,
the purging of packages if not installed, fails with the
exit code of 100.
2023-08-08 15:17:02 +05:30
Michael Hudson-Doyle
4f6f63dd6b Remove additional dependencies from subiquity units as they are now interfering with the boot process. (LP: #2028862) 2023-08-08 13:02:08 +12:00
Łukasz 'sil2100' Zemczak
494ef427e8 Merge branch 'canary-locale' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master 2023-08-07 11:31:02 +02:00
Dan Bungert
aa2d04bd9d revert KERNEL_FLAVORS=none 2023-08-03 21:39:04 -06:00
Łukasz 'sil2100' Zemczak
4fc64be673 Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into canary-locale 2023-08-03 12:51:12 +02:00
Łukasz 'sil2100' Zemczak
4cc5d37900 Fix changelog version and whitespace. 2023-08-03 12:48:47 +02:00
Dan Bungert
95b37dcb8c budgie: KERNEL_FLAVOURS=none 2023-08-02 16:06:31 -06:00
Dan Bungert
6010b5de5e desktop: KERNEL_FLAVOURS=none
no need to include the kernel directly, it is installed at
runtime (LP: #2026225)
2023-08-02 16:06:31 -06:00
Michael Hudson-Doyle
cf75120068 lb_chroot_layered: use rsync to make more minimal overlay layers. (LP: #2028213) 2023-08-02 13:18:03 +12:00
Heinrich Schuchardt
fd75a28558 risc-v: increase loader 2 partition for VF2
EDK II is available for the StarFive VisionFive 2 board. As it is larger
than U-Boot we need to increase the size of the loader 2 partition to
accommodate it.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-08-01 16:06:00 +02:00
Michael Hudson-Doyle
d3dfb12f85 Actually fix live-build/ubuntu-cpc/hooks.d/base/disk-image.binary to not call force_boot_without_initramfs on s390x rather than disk-image-uefi.binary which obviously would never run on s390x. 2023-07-29 13:02:56 +12:00
Michael Hudson-Doyle
37341541b4 live-build/ubuntu-cpc/hooks.d/base/disk-image.binary: Do not call force_boot_without_initramfs on s390x. 2023-07-29 07:34:35 +12:00
Michael Hudson-Doyle
c42f2ef3b1 live-build/ubuntu-cpc/hooks.d/base/disk-image-*.binary: Fix invocations of force_boot_without_initramfs to pass "mountpoint" and not "${mountpoint}" (which actually worked on most arches for VERY BAD reasons but fails on s390x). 2023-07-29 07:33:22 +12:00
Michael Hudson-Doyle
ee2b6290bc Merge remote-tracking branch 'utkarsh/ubuntu-cloud-minimal' into ubuntu/master 2023-07-28 11:01:41 +12:00
Łukasz 'sil2100' Zemczak
09cec13e37 canary: attempt to enable locale support for canary layers. 2023-07-19 17:15:57 +02:00
Utkarsh Gupta
06defc4348 Use ubuntu-cloud-minimal metapackage in minimized CPC images
Now that we have the cloud-minimal seed for minimized cloud
image builds, we should drop all the workarounds and hacks
we once needed when we were using the server seed. We can
directly use the new metapackage and get rid of the tasks and
other autoremoves, et al.
2023-07-19 16:36:35 +05:30
Łukasz 'sil2100' Zemczak
9d9f7a71a5 canary: use 23.10 models. 2023-07-19 11:06:40 +02:00
Dimitri John Ledkov
c18d3f75ad
Fixup up two more places with kvm removal.
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-07-14 13:16:05 +01:00
Dimitri John Ledkov
433a79d5a9
Merge remote-tracking branch 'origin/xnox/virtual-armhf' into ubuntu/master 2023-07-14 00:24:43 +01:00
Dimitri John Ledkov
731a0b49e3
Merge remote-tracking branch 'origin/xnox/deprecate-kvm' into ubuntu/master 2023-07-14 00:24:36 +01:00
Yao Wei (魏銘廷)
1038f94330 feat: add ubuntu-oem project for oem images 2023-07-12 11:10:40 +08:00
Michael Hudson-Doyle
448defa7f3 Merge branch 'revert/cpc/esp_on_boot' into ubuntu/master 2023-07-10 22:26:38 +12:00
Sebastien Bacher
a67777a41f Remove the catalog entry for minimal Ubuntu desktop 2023-07-06 20:35:31 +02:00
Gauthier Jolly
2929ff092e Revert "ubuntu-cpc: Make the ESP 2GiB and mount it to /boot"
Revert this change for now as /boot then becomes a FAT partition which
breaks DPKG requirements[1]. This change is going to be re-evaluated and
maybe introduced in a different way.

This is not a clean revert because of 3282efb ("ubuntu-cpc: cleanup
disk-images-uefi.binary") which we want to keep.

[1] https://wiki.debian.org/Teams/Dpkg/FAQ#Q:_What_are_the_filesystem_requirements_by_dpkg.3F

This reverts commit 6a66666e0a5ab1ad96cb0e388f278aafbd012ffe.
2023-07-06 11:12:01 +02:00
Gauthier Jolly
a3307ebdb7 Revert "ubuntu-cpc: disable kernel and initramfs symlinks in /boot"
This reverts commit b20e894a9878837ed84f9db71997f68476d632b5.
2023-07-06 11:04:20 +02:00
Heinrich Schuchardt
af577c87b2 RISC-V: handle kernel flavour allwinner
Package linux-allwinner has a kernel with the generic flavour as
dependency. Add this translation to our code checking the correct
installation.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-07-05 14:52:54 +02:00
Heinrich Schuchardt
476e202403 Revert RISC-V: sunset allwinner kernel flavour
According to the kernel team the Linux Meta package linux-allwinner shall
continue to be supplied. It will depend on generic packages.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-07-05 14:51:08 +02:00
Michael Hudson-Doyle
b5387cb32b Disable the orphan_file ext4 feature in the canary live environment so that the installed system can be handled by the e2fsck in the extant kernel snap (cf. bug 2025339). 2023-07-05 11:41:44 +12:00
Michael Hudson-Doyle
7d0aa68826 live-build/ubuntu/hooks/033-disk-image-uefi.binary: update to point at ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary, fixing canary build. 2023-07-05 10:13:38 +12:00
Dimitri John Ledkov
dc59fe83ca Deprecate linux-kvm usage
Remove kvm-image altogether.

Previously for minimal image replace_kernel function replaced virtual
images with kvm, and called force_boot_without_initramfs. Now simply
call force_boot_without_initramfs for minimal image without replacing
kernel flavour.

This also means minimal images can now be built for arm64 and armhf.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-07-04 12:58:03 +01:00
Dimitri John Ledkov
1b6bfda382 Switch armhf from generic-lpae to virtual
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-07-04 12:51:39 +01:00