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.

regular.mk: more sysvinit-based images
b44e6e2e · Michael Shigorin · 0ab00c09 · b44e6e2e
Commit b44e6e2e authored Oct 14, 2013 by Michael Shigorin
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

regular.mk conf.d/regular.mk +9 -5

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -31,14 +31,14 @@ distro/.regular-desktop: distro/.regular-base \
 	@$(call set,KFLAVOURS,std-def)

 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 \
-	use/x11/lightdm/gtk +icewm
+distro/regular-icewm: distro/.regular-sysv-gtk +icewm
 	@$(call add,LIVE_LISTS,$(call tags,regular icewm))
 	@$(call set,KFLAVOURS,un-def)

-distro/regular-wmaker: distro/.regular-desktop use/x11/lightdm/gtk \
-	use/x11/wmaker
+distro/regular-wmaker: distro/.regular-sysv-gtk use/x11/wmaker use/efi/refind
 	@$(call add,LIVE_PACKAGES,livecd-install-wmaker)
 	@$(call add,LIVE_PACKAGES,xxkb)

@@ -70,10 +70,14 @@ distro/regular-cinnamon: distro/.regular-gtk \

 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_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 \
 	use/fonts/zerg +pulse +plymouth
 	@$(call add,LIVE_LISTS,$(call tags,regular kde4))