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

desktop.mk: refactor net-eth usage with +net-eth

Browse Source 
It was spilled over an intermediate target and a mixin
for what looks like no good reason; let's factor these
in by means of +net-eth as *both* are really needed
for an installer anyways, and if/when we do installers
with those new and crippled ethernet interface names
this addition can be dropped to be used where required.
This commit is contained in:
Michael Shigorin 2014-08-26 22:38:45 +04:00
parent 7c9794a827
commit 559714a271
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf.d/desktop.mk
View File

@ -6,15 +6,14 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg
distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
mixin/desktop-installer: use/x11-autostart use/net-eth use/sound +vmguest
mixin/desktop-installer: use/x11-autostart use/sound +net-eth +vmguest
@$(call add,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,BASE_PACKAGES,os-prober)
distro/.desktop-network: distro/.desktop-mini \
mixin/desktop-installer use/stage2/net-eth; @:
distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
distro/.desktop-extra:
@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))