From b40ce74fd67bbaa7f9ec94463d8da759724f9fec Mon Sep 17 00:00:00 2001 From: Ivan Kapelyukhin Date: Tue, 22 Feb 2022 09:49:11 +0100 Subject: [PATCH] perf(cpc): split disk-image-uefi out of disk-image series file Due to how `disk-image` file is structured, it builds BIOS and UEFI images at the same time. However, certain images (e.g., GCE images) require only UEFI image to be built, BIOS image is being simply discarded. This results in longer build times. Splitting out `disk-image-uefi` would allow images to use it instead of `disk-image` and thus avoid building unused BIOS images. `disk-image` now depends on `disk-image-uefi` for backward compatibility. --- live-build/ubuntu-cpc/hooks.d/base/series/disk-image | 2 +- live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image index fa13c6f1..3b356075 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image +++ b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image @@ -1,5 +1,5 @@ +depends disk-image-uefi base/disk-image.binary -base/disk-image-uefi.binary base/disk-image-ppc64el.binary provides livecd.ubuntu-cpc.ext4 provides livecd.ubuntu-cpc.initrd-generic diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi new file mode 100644 index 00000000..438930b7 --- /dev/null +++ b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi @@ -0,0 +1,8 @@ +base/disk-image-uefi.binary +provides livecd.ubuntu-cpc.ext4 +provides livecd.ubuntu-cpc.initrd-generic +provides livecd.ubuntu-cpc.initrd-generic-lpae +provides livecd.ubuntu-cpc.kernel-generic +provides livecd.ubuntu-cpc.kernel-generic-lpae +provides livecd.ubuntu-cpc.manifest +provides livecd.ubuntu-cpc.filelist