Commit b44e6e2e authored by Michael Shigorin's avatar Michael Shigorin

regular.mk: more sysvinit-based images

distro/.regular-sysv{,-gtk} intermediate targets are factored out to form the base for more image targets as at least e17, icewm, tde and wmaker are fine without systemd-logind. These represent both GTK and Qt based environments hence the two footholds.
parent 0ab00c09
...@@ -31,14 +31,14 @@ distro/.regular-desktop: distro/.regular-base \ ...@@ -31,14 +31,14 @@ distro/.regular-desktop: distro/.regular-base \
@$(call set,KFLAVOURS,std-def) @$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-sysv: distro/.regular-base use/init/sysv; @:
distro/.regular-sysv-gtk: distro/.regular-sysv use/x11/lightdm/gtk; @:
distro/regular-icewm: distro/.regular-base use/init/sysv \ distro/regular-icewm: distro/.regular-sysv-gtk +icewm
use/x11/lightdm/gtk +icewm
@$(call add,LIVE_LISTS,$(call tags,regular icewm)) @$(call add,LIVE_LISTS,$(call tags,regular icewm))
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
distro/regular-wmaker: distro/.regular-desktop use/x11/lightdm/gtk \ distro/regular-wmaker: distro/.regular-sysv-gtk use/x11/wmaker use/efi/refind
use/x11/wmaker
@$(call add,LIVE_PACKAGES,livecd-install-wmaker) @$(call add,LIVE_PACKAGES,livecd-install-wmaker)
@$(call add,LIVE_PACKAGES,xxkb) @$(call add,LIVE_PACKAGES,xxkb)
...@@ -70,10 +70,14 @@ distro/regular-cinnamon: distro/.regular-gtk \ ...@@ -70,10 +70,14 @@ distro/regular-cinnamon: distro/.regular-gtk \
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @: distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:
distro/regular-tde: distro/.regular-desktop use/net-eth/dhcp +tde +plymouth +nm distro/regular-tde: distro/.regular-desktop +tde +plymouth +nm
@$(call add,LIVE_PACKAGES,kdegames kdeedu) @$(call add,LIVE_PACKAGES,kdegames kdeedu)
@$(call add,LIVE_LISTS,openscada) @$(call add,LIVE_LISTS,openscada)
distro/regular-tde-sysv: distro/.regular-sysv \
use/net-eth/dhcp use/efi/refind +tde +plymouth
@$(call add,LIVE_LISTS,openscada)
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \ distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
use/fonts/zerg +pulse +plymouth use/fonts/zerg +pulse +plymouth
@$(call add,LIVE_LISTS,$(call tags,regular kde4)) @$(call add,LIVE_LISTS,$(call tags,regular kde4))
......
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