Commit 559714a2 authored by Michael Shigorin's avatar Michael Shigorin

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

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.
parent 7c9794a8
...@@ -6,15 +6,14 @@ distro/.desktop-base: distro/.installer use/syslinux/ui/vesamenu use/x11/xorg ...@@ -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; @: 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,SYSTEM_PACKAGES,fonts-ttf-google-croscore-arimo)
@$(call add,BASE_LISTS, \ @$(call add,BASE_LISTS, \
$(call tags,(base || desktop) && (l10n || network))) $(call tags,(base || desktop) && (l10n || network)))
@$(call add,INSTALL2_PACKAGES,ntfs-3g) @$(call add,INSTALL2_PACKAGES,ntfs-3g)
@$(call add,BASE_PACKAGES,os-prober) @$(call add,BASE_PACKAGES,os-prober)
distro/.desktop-network: distro/.desktop-mini \ distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
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)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment