desktop.mk: split out a mixin

What was added for networked desktop installers is now needed for regular desktop installers as well; moved to a mixin. These will probably get reshaked at some point.

desktop.mk: split out a mixin
20138959 · Michael Shigorin · 87a22774 · 20138959
Commit 20138959 authored Nov 13, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

desktop.mk conf.d/desktop.mk +4 -1

No files found.
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -6,12 +6,15 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg

 distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:

-distro/.desktop-network: distro/.desktop-mini use/stage2/net-eth +vmguest
+mixin/desktop-installer: use/x11-autostart +vmguest
 	@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
 	@$(call add,BASE_PACKAGES,udev-rule-generator-net sysklogd)
 	@$(call add,BASE_LISTS, \
 		$(call tags,(base || desktop) && (l10n || network)))

+distro/.desktop-network: distro/.desktop-mini \
+	mixin/desktop-installer use/stage2/net-eth; @:
+
 distro/.desktop-extra:
 	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))