regular.mk: sync regular-tde{,-sysv} as in extras

I considered these two to be either close forks differing in init system used (and things involved too much like NM at the moment), or to bring some more choice along; this commit sticks with the former approach, namely "let's only toggle the init system and let the rest be the same" so that choosing the particular implementation can be based on this very difference and not any other ones added along with it.

regular.mk: sync regular-tde{,-sysv} as in extras
8834dd82 · Michael Shigorin · cf838e78 · 8834dd82
Commit 8834dd82 authored Oct 30, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

regular.mk conf.d/regular.mk +8 -4

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -73,13 +73,17 @@ distro/regular-cinnamon: distro/.regular-gtk \

 distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:

-distro/regular-tde: distro/.regular-desktop +tde +plymouth +nm
+# reusable bits
+distro/.regular-tde-extras:
 	@$(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-tde: distro/.regular-desktop distro/.regular-tde-extras \
+	+tde +plymouth +nm; @:
+
+distro/regular-tde-sysv: distro/.regular-sysv distro/.regular-tde-extras \
+	use/net-eth/dhcp use/syslinux/ui/gfxboot use/efi/refind \
+	+tde +plymouth; @:

 distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
 	use/fonts/zerg +pulse +plymouth