desktop.mk, mixin.mk: replace desktop-extra target

mixin/desktop-extra will be used for non-ISO builds

desktop.mk, mixin.mk: replace desktop-extra target
15888b4d · Anton Midyukov · Michael Shigorin · 35530c67 · 15888b4d · 15888b4d
Commit 15888b4d authored Jan 07, 2019 by Anton Midyukov Committed by Michael Shigorin Jan 21, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

desktop.mk conf.d/desktop.mk +0 -3

mixin.mk conf.d/mixin.mk +3 -0

No files found.
--- a/conf.d/desktop.mk
+++ b/conf.d/desktop.mk
@@ -8,9 +8,6 @@ distro/.desktop-mini: distro/.desktop-base use/x11/xdm +power; @:
 distro/.desktop-network: distro/.desktop-mini mixin/desktop-installer; @:
-distro/.desktop-extra:
-	@$(call add,BASE_LISTS,$(call tags,(archive || base) && (extra)))
 distro/icewm: distro/.desktop-network use/lowmem use/install2/fs +icewm; @:
 distro/ltsp-tde: distro/tde +ltsp; @:
 distro/ltsp-icewm: distro/icewm +ltsp; @:

--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -58,6 +58,9 @@ mixin/regular-desktop: use/x11/xorg +alsa use/xdg-user-dirs
 	@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
+mixin/desktop-extra:
+	@$(call add,BASE_LISTS,$(call tags,(archive || base) && extra))
 mixin/regular-wmaker: use/efi/refind use/syslinux/ui/gfxboot \
 	use/fonts/ttf/redhat use/x11/wmaker
 	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)