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

mixin/desktop-extra will be used for non-ISO builds
This commit is contained in:
Anton Midyukov 2019-01-07 14:31:27 +07:00 committed by Michael Shigorin
parent 35530c6789
commit 15888b4d95
2 changed files with 3 additions and 3 deletions

View File

@ -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; @:

View File

@ -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)