Browse Source

Revert "Revert "ubuntu-minimal : only install 16.04 HWE kernel on xenial""

This reverts commit 6e549c33ac.

It uses the new multiple-parameter matching format from
Idff7b067ad4255e6fc4138f7eff313a81b75c8ba to actually do what it says.

Change-Id: I4656ff1a5c46bcfbd8587f2f541825f4ad08820f
tags/2.37.2^0
Ian Wienand 2 months ago
parent
commit
339d713527
1 changed files with 20 additions and 11 deletions
  1. +20
    -11
      diskimage_builder/elements/ubuntu-minimal/package-installs.yaml

+ 20
- 11
diskimage_builder/elements/ubuntu-minimal/package-installs.yaml View File

@@ -1,27 +1,36 @@
linux-image-generic:
not-arch: arm64
when: DIB_UBUNTU_KERNEL = linux-image-generic
- not-arch: arm64
when: DIB_UBUNTU_KERNEL = linux-image-generic
- arch: arm64
when:
- DIB_RELEASE != xenial
- DIB_UBUNTU_KERNEL = linux-image-generic

# On ARM64/Xenial install the HWE kernel as generic because the base
# kernel is very old and causes problems.
linux-generic-hwe-16.04:
arch: arm64
when:
- DIB_RELEASE = xenial
- DIB_UBUNTU_KERNEL = linux-image-generic

# NOTE: there isn't actually an arm64 linux-image-kvm, but we don't
# have a way to error out here.
linux-image-kvm:
not-arch: arm64
when: DIB_UBUNTU_KERNEL = linux-image-kvm

linux-image-virtual:
not-arch: arm64
when: DIB_UBUNTU_KERNEL = linux-image-virtual

linux-generic-hwe-18.04:
not-arch: arm64
when:
- DIB_UBUNTU_KERNEL = linux-image-hwe
- DIB_RELEASE = bionic

linux-generic-hwe-20.04:
not-arch: arm64
when:
- DIB_UBUNTU_KERNEL = linux-image-hwe
- DIB_RELEASE = focal

# TODO(ianw): this is Xenial specific, for now. This kernel works
# much better, however, including better support for cdrom's for
# config-drive. We'll need to filter this further for future
# releases; maybe add a $DIB_RELEASE filter too?
linux-generic-hwe-16.04:
arch: arm64
initramfs-tools:

Loading…
Cancel
Save