From 559714a271fa38f1d76c46aa0f3456e189584637 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Tue, 26 Aug 2014 22:38:45 +0400 Subject: [PATCH] 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. --- conf.d/desktop.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/conf.d/desktop.mk b/conf.d/desktop.mk index 846b7b0b..b150969d 100644 --- a/conf.d/desktop.mk +++ b/conf.d/desktop.mk @@ -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)))