live: factored out installation options

After having added metadata dependency livecd-install started to look more like a feature than like an intermediate distribution target; so things were shuffled a bit that way.

live: factored out installation options
6b0e5838 · Michael Shigorin · c83cc111 · 6b0e5838 · 6b0e5838
Commit 6b0e5838 authored May 08, 2012 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

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

config.mk features.in/live/config.mk +8 -0

No files found.
--- a/conf.d/live.mk
+++ b/conf.d/live.mk
@@ -28,11 +28,8 @@ distro/live-builder: distro/.live-base use/dev/mkimage use/dev/repo
 	@$(call add,MAIN_PACKAGES,$(pkgs))
 	@$(call add,MAIN_PACKAGES,syslinux pciids memtest86+ mkisofs)

-distro/live-install: distro/.live-base use/syslinux/localboot.cfg
-	@$(call add,LIVE_PACKAGES,live-install)
-
-distro/.livecd-install: distro/.live-base use/syslinux/localboot.cfg
-	@$(call add,LIVE_PACKAGES,livecd-install)
+distro/live-install: distro/.live-base use/live/textinst; @:
+distro/.livecd-install: distro/.live-base use/live/install; @:

 distro/live-icewm: distro/.live-desktop use/live/autologin +icewm; @:
 distro/live-razorqt: distro/.live-desktop +razorqt; @:

--- a/features.in/live/config.mk
+++ b/features.in/live/config.mk
@@ -16,6 +16,14 @@ use/live/desktop: use/live/base use/x11/wacom use/live/sound +vmguest +power
 	@$(call add,LIVE_PACKAGES,fonts-ttf-dejavu fonts-ttf-droid)
 	@$(call add,SYSLINUX_CFG,localboot)

+# alterator-based permanent installation
+use/live/install: use/metadata use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,livecd-install)
+
+# text-based installation script
+use/live/textinstall: use/syslinux/localboot.cfg
+	@$(call add,LIVE_PACKAGES,live-install)
+
 # NB: there's an unconditional live/image-scripts.d/40-autologin script
 #     *but* it only configures some of the *existing* means; let's add one
 #     for the cases when there should be no display manager