keremet/mkimage-profiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

desktop.mk: split out a mixin

Browse Source 
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.
This commit is contained in:
Michael Shigorin 2013-11-13 17:35:18 +04:00
parent 87a22774c0
commit 20138959de
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/desktop.mk
View File

@ -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-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,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,BASE_PACKAGES,udev-rule-generator-net sysklogd) @$(call add,BASE_PACKAGES,udev-rule-generator-net sysklogd)
@$(call add,BASE_LISTS, \ @$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network))) $(call tags,(base || desktop) && (l10n || network)))
distro/.desktop-network: distro/.desktop-mini \
mixin/desktop-installer use/stage2/net-eth; @:
distro/.desktop-extra: distro/.desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra))) @$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))