Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-05 16:01:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

disk-image.binary: actually skip building MBR image on EFI platforms.

Browse Source 
The case is for arch:subarch combo, not just arch alone even if
subarch is empty. Thus currently on adm64/arm64/armhf ubuntu-cpc
builds mbr image is created and then ignored, as the convert to qcow2
hook prefers the uefi image whenever available.

Skipping building these correctly, should speed up the build a little
bit and use slightly less disk space.
This commit is contained in:
Dimitri John Ledkov 2020-11-17 23:37:52 +00:00
parent 62986bd84b
commit ff175e3f4a
No known key found for this signature in database
GPG Key ID: 9B8EC849D5EF70ED
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
live-build/ubuntu-cpc/hooks.d/base/disk-image.binary
View File

@ -19,10 +19,6 @@ case $ARCH:$SUBARCH in
echo "POWER disk images are handled separately" echo "POWER disk images are handled separately"
exit 0 exit 0
;; ;;
amd64|arm64|armhf)
echo "We only create EFI images for $ARCH."
exit 0
;;
armhf:raspi2) armhf:raspi2)
# matches the size of the snappy image # matches the size of the snappy image
IMAGE_SIZE=$((4*1000*1000*1000)) IMAGE_SIZE=$((4*1000*1000*1000))
@ -31,6 +27,10 @@ case $ARCH:$SUBARCH in
BOOTPART_END=138M BOOTPART_END=138M
BOOT_MOUNTPOINT=/boot/firmware BOOT_MOUNTPOINT=/boot/firmware
;; ;;
amd64:*|arm64:*|armhf:*)
echo "We only create EFI images for $ARCH."
exit 0
;;
*) *)
;; ;;
esac esac