[neon/neon/livecd-rootfs/Neon/release] live-build/ubuntu/hooks: fix(HyperV desktop): Ensure removed hyperv dependencies are present in HyperV builds (LP: #2064280)

[Philip Roche]

Git commit b12e271417b1b0146d4573a00ce1856d4b25056d by Philip Roche, on behalf of Phil Roche.
Committed on 24/05/2024 at 14:30.
Pushed by carlosdem into branch 'Neon/release'.

fix(HyperV desktop): Ensure removed hyperv dependencies are present in HyperV builds (LP: #2064280)

A change in 8fb21808 also removed many of the dependencies that the hyperv images require.
This removal has been restored in this commit by adding them expliciltly in the hyperv hook.

(cherry picked from commit c459e5e5af0371c0228bd4e5ddec57b8954d39df)

M  +5    -6    live-build/ubuntu/hooks/040-hyperv-desktop-images.binary

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

diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
index 1e7bc461..df111588 100644
--- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
+++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
@@ -40,7 +40,7 @@ trap cleanup_hyperv EXIT
 # Perform customisations
 
 chroot "${scratch_d}" apt-get update -y
-chroot "${scratch_d}" apt-get -y install xrdp linux-azure linux-tools-azure linux-cloud-tools-azure
+chroot "${scratch_d}" apt-get -y install xrdp linux-azure linux-tools-azure linux-cloud-tools-azure polkitd-pkla oem-config-gtk ubiquity-frontend-gtk  ubiquity-slideshow-ubuntu language-pack-en-base oem-config-slideshow-ubuntu
 
 cat > ${scratch_d}/etc/modules-load.d/hyperv.conf << EOF
 ${IMAGE_STR}
@@ -124,20 +124,19 @@ touch "${scratch_d}/var/lib/oem-config/run"
 
 chroot "${scratch_d}" apt-get clean
 
+raw_img=binary/boot/disk-hyperv-uefi.ext4
+vhd_img=livecd.ubuntu-desktop-hyperv.vhdx
+
+create_manifest "${scratch_d}" "$vhd_img.zip.manifest"
 # End customisations
 
 cleanup_hyperv
 trap - EXIT
 
-raw_img=binary/boot/disk-hyperv-uefi.ext4
-vhd_img=livecd.ubuntu-desktop-hyperv.vhdx
-
 qemu-img convert -O vhdx "$raw_img" "$vhd_img"
 rm "$raw_img"
 
 apt-get install -y zip
 
-create_manifest chroot "$vhd_img.zip.manifest"
-
 zip "$vhd_img.zip" "$vhd_img"
 rm "$vhd_img"