From 339d713527efc1578b0522ae7daf1f9d5ed6a8fd Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 26 May 2020 08:46:17 +1000 Subject: [PATCH] Revert "Revert "ubuntu-minimal : only install 16.04 HWE kernel on xenial"" This reverts commit 6e549c33ac1ead9e7bbb3e13f38296ee36e28ed9. It uses the new multiple-parameter matching format from Idff7b067ad4255e6fc4138f7eff313a81b75c8ba to actually do what it says. Change-Id: I4656ff1a5c46bcfbd8587f2f541825f4ad08820f --- .../ubuntu-minimal/package-installs.yaml | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml b/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml index d91f24950..26b2328f7 100644 --- a/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml +++ b/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml @@ -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: