live.mk: added efi/isohybrid to webkiosk images

This has apparently been a TODO item stuck until finding out whether efi and isohybrid conflict or not; it's been a *long* time since this has been found out (no conflict) actually, let's add isohybrid to all of the images as it's completely free size-wise and efi to chromium image as it's the largest base one (I don't think that adding any extra functionality to the already overweight and full of potential and kinetic security bugs "flash" flavour is a good idea as it would promote its use among those who need EFI but not Flash).

live.mk: added efi/isohybrid to webkiosk images
7258e750 · Michael Shigorin · bcf4c4a2 · 7258e750
Commit 7258e750 authored Sep 08, 2015 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

live.mk conf.d/live.mk +5 -6

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -49,24 +49,23 @@ distro/live-rescue: distro/live-icewm +efi
 		$(call tags,(base || extra) && (archive || rescue || network)))

 # NB: this one doesn't include the browser, needs to be chosen downstream
-distro/.live-webkiosk: distro/.live-kiosk use/live/hooks use/live/ru use/sound
+distro/.live-webkiosk: distro/.live-kiosk \
+	use/isohybrid use/live/hooks use/live/ru use/sound
 	@$(call add,LIVE_LISTS,$(call tags,live desktop))

 distro/.live-webkiosk-gtk: distro/.live-webkiosk
 	@$(call add,CLEANUP_PACKAGES,'libqt4*' 'qt4*')

-distro/live-webkiosk-mini: distro/.live-webkiosk-gtk \
-	use/fonts/otf/mozilla use/isohybrid
+distro/live-webkiosk-mini: distro/.live-webkiosk-gtk use/fonts/otf/mozilla
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk-firefox)

 # NB: flash/java plugins are predictable security holes
 distro/live-webkiosk-flash: distro/live-webkiosk-mini use/plymouth/live \
-	use/browser/plugin/flash use/browser/plugin/java use/efi/signed \
-	+vmguest; @:
+	use/browser/plugin/flash use/browser/plugin/java +vmguest; @:

 distro/live-webkiosk: distro/live-webkiosk-mini use/live/desktop; @:

-distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google
+distro/live-webkiosk-chromium: distro/.live-webkiosk use/fonts/ttf/google +efi
 	@$(call add,LIVE_PACKAGES,livecd-webkiosk-chromium)

 distro/live-webkiosk-seamonkey: distro/.live-webkiosk use/fonts/ttf/google