2028 Commits

Author SHA1 Message Date
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
220e563de3 live-build/functions: add additional debugging to mount_image() on failure since we again have loop partitions failing to be block devices. 2023-12-03 21:38:20 -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
4fb141bbec Merge remote-tracking branch 'dbungert/adt-hang-vagrant' into ubuntu/master 2023-12-03 21:20:22 -08:00
Steve Langasek
5728443d00 Merge remote-tracking branch 'jibel/germinate_with_updates' into ubuntu/master 2023-12-03 19:59:07 -08:00
Dave Jones
2a415654a5 Use oem-config-prepare package
Remove this hook; it's only for pre-installed desktop images and
8fb2180842c452ff08dd41a5746c00bfd69521cf already removed the other bits
for pre-installed desktop images.
2023-11-28 16:00:42 +00:00
Ankush Pathak
19bceac8b3 fix: Re-enable universe for pre-installed images (LP: #2044154) 2023-11-21 11:31:06 -05:00
Yao Wei (魏銘廷)
02a7faaa43 ubuntu-oem: add dummy files in order not to fail make-hooks 2023-11-15 13:06:41 +01: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
Brian Murray
22a26cc97a Remove part of a comment which is incorrect 2023-10-31 00:01:48 -07:00
Philip Roche
5d959b24da fix: Enable snap preseeding with ppc64el images where /boot/vmlinux is used instead of /boot/vmlinuz. (LP: #2038957)
ppc64el still uses /boot/vmlinux so we need to determine the boot file name as non ppc64el use /boot/vmlinuz. This
is then used to determine the kernel major minor version installed so that the correct apparmor features can be used
during snap preseeding. This preseeding was failing for ppc64el for the mantic 6.5 kernel as the /boot/vmlinuz
being checked did not exist.
2023-10-26 18:02:32 +01:00
Paride Legovini
1586916934 Merge remote-tracking branch 'xypron/armhf' into ubuntu/master 2023-10-25 17:57:14 +02:00
Heinrich Schuchardt
21321ac018 arm: fix console parameter for ARM cloud-images
On armhf and arm64 the QEMU virt machine provides the serial console as an
emulated AMBA PrimeCell UART which the kernel refers to as /dev/ttyAMA0.

Consider this when constructing GRUB_CMDLINE_LINUX_DEFAULT in file
/etc/default/grub.d/50-cloudimg-settings.cfg (LP: #2036730).

Reviewed-by: Gauthier Jolly <gauthier.jolly@canonical.com>
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
2023-10-18 10:20:28 +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
John Chittum
5427e5ad6c
fix: Add 6.5 kernel apparmor feats
lp: #2037567. starting in kernel 6.5.0.1006, there's been an update to
apparmor features. Creates the 6.5 kernel directory, fully populates
with feats checked from a machine running 6.5.0.1006 installed from
proposed (as of 20230927).
2023-10-05 07:30:01 -05:00
Sebastien Bacher
51b7278c4b Update the desktop fde model to include firmware-updater 2023-10-03 21:13:03 +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
Steve Langasek
85606c8b9d Merge remote-tracking branch 'philroche/bugfix/ubuntu-cpc-filelist-sort-LP-2033677' into ubuntu/master 2023-10-02 16:57:29 -07:00
Dimitri John Ledkov
dc7519a44a Create subiquity meta-package hint 2023-10-02 17:28:40 +01:00
Dimitri John Ledkov
deb31732db Ensure chroot_linux-image is only exectued on live layers
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-10-02 10:39:30 +01: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
Dimitri John Ledkov
378322380e live-build/ubuntu/hooks: ensure kernel artifacts named with subarch
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2023-09-29 04:45:12 +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
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
Steve Langasek
9fce6428c3 alphabetize the list 2023-09-26 10:18:26 -07: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
Steve Langasek
1f2523920d Add missing '|' 2023-09-26 09:46:16 -07: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
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