From 8834dd824f7e9b81f1f984309a6e17c8828adbee Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Wed, 30 Oct 2013 15:29:18 +0400 Subject: [PATCH] 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. --- conf.d/regular.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index d14345d2..80113d01 100644 --- 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