diff --git a/conf.d/live.mk b/conf.d/live.mk index bb33a584..a3dc7450 100644 --- a/conf.d/live.mk +++ b/conf.d/live.mk @@ -72,18 +72,7 @@ distro/live-flightgear: distro/.live-x11 use/x11/lightdm/gtk use/x11/3d +icewm @$(call add,LIVE_PACKAGES,FlightGear fgo input-utils) @$(call try,HOMEPAGE,http://www.4p8.com/eric.brasseur/flight_simulator_tutorial.html) -distro/live-gnome: distro/.live-desktop-ru use/systemd use/x11/blobs - @$(call add,LIVE_PACKAGES,gnome3-default) - -distro/live-cinnamon: distro/.live-desktop-ru use/live/autologin \ - use/x11/cinnamon use/x11/3d-proprietary; @: - -distro/live-mate: distro/.live-desktop-ru use/live/nodm use/x11/3d-free - @$(call add,LIVE_LISTS,openssh $(call tags,(desktop || mobile) && mate)) - @$(call set,KFLAVOURS,un-def) # the newest one - -distro/live-e17: distro/.live-desktop-ru use/live/autologin \ - use/x11/e17 use/x11/gdm2.20; @: +distro/live-e17: distro/.live-desktop-ru use/x11/e17 use/x11/lightdm/gtk; @: distro/live-gimp: distro/live-icewm use/live/ru @$(call add,LIVE_PACKAGES,gimp tintii immix fim) @@ -92,6 +81,4 @@ distro/live-gimp: distro/live-icewm use/live/ru @$(call add,LIVE_PACKAGES,qtfm openssh-clients rsync) @$(call add,LIVE_PACKAGES,design-graphics-sisyphus2) -distro/live-sugar: distro/.live-desktop-ru use/x11/sugar; @: - endif diff --git a/conf.d/test.mk b/conf.d/test.mk index ab9a1e0d..a7c51fc4 100644 --- a/conf.d/test.mk +++ b/conf.d/test.mk @@ -44,7 +44,6 @@ distro/server-ovz-netinst: distro/.base sub/stage1 use/stage2 \ distro/desktop-luks: distro/icewm use/luks; @: distro/desktop-systemd: distro/icewm +systemd; @: distro/desktop-plymouth: distro/icewm +plymouth; @: -distro/live-mate-systemd: distro/live-mate use/systemd use/live/install; @: distro/server-efi: distro/server-mini use/efi/debug; @: endif # IMAGE_CLASS: distro