[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu-cpc/hooks.d/base/series: perf(cpc): split disk-image-uefi out of disk-image series file

Ivan Kapelyukhin null at kde.org
Mon Apr 4 12:29:50 BST 2022


Git commit e64406f4f846c7b9e7d2970825b2a7cacdd45bc8 by Ivan Kapelyukhin.
Committed on 03/03/2022 at 14:57.
Pushed by jriddell into branch 'Neon/release'.

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.

(cherry picked from commit b40ce74fd67bbaa7f9ec94463d8da759724f9fec)

M  +1    -1    live-build/ubuntu-cpc/hooks.d/base/series/disk-image
C  +0    -2    live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi [from: live-build/ubuntu-cpc/hooks.d/base/series/disk-image - 085% similarity]

https://invent.kde.org/neon/neon/livecd-rootfs/commit/e64406f4f846c7b9e7d2970825b2a7cacdd45bc8

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 b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi
similarity index 85%
copy from live-build/ubuntu-cpc/hooks.d/base/series/disk-image
copy to live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi
index fa13c6f1..438930b7 100644
--- a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image
+++ b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi
@@ -1,6 +1,4 @@
-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
 provides livecd.ubuntu-cpc.initrd-generic-lpae



More information about the Neon-commits mailing list