From c5acc91574a72978c12c2bb6d1ee4790ae050ee7 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 12 May 2020 13:09:30 +1000 Subject: [PATCH] ubuntu-minimal: fix HWE install for focal On Focal, install the 20.04 HWE kernel if linux-image-hwe is specified. Change-Id: I5d536e8f64e7b987415849d8cd4da7959bba7af7 --- .../elements/ubuntu-minimal/package-installs.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml b/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml index ea62779f..d91f2495 100644 --- a/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml +++ b/diskimage_builder/elements/ubuntu-minimal/package-installs.yaml @@ -9,7 +9,15 @@ linux-image-virtual: when: DIB_UBUNTU_KERNEL = linux-image-virtual linux-generic-hwe-18.04: not-arch: arm64 - when: DIB_UBUNTU_KERNEL = linux-image-hwe + 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