regular.mk: introduced mixin/regular-xfce-sysv

This is also no-op for the particular image being modified as LIVE_PACKAGES is a subset of THE_PACKAGES in terms of subprofiles affected. NB: move use/browser/firefox/classic from systemd-based xfce flavour here -- looks more appropriate ;-)

regular.mk: introduced mixin/regular-xfce-sysv
0bac7d68 · Michael Shigorin · bd7e2257 · 0bac7d68
Commit 0bac7d68 authored Dec 03, 2016 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

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

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -131,13 +131,18 @@ distro/regular-gnustep-systemd: distro/.regular-wm +systemd \
 mixin/regular-xfce: use/x11/xfce use/fonts/ttf/redhat use/x11/gtk/nm +nm; @:

 distro/regular-xfce: distro/.regular-gtk mixin/regular-xfce \
-	use/x11/xfce/full use/domain-client/full use/browser/firefox/classic
+	use/x11/xfce/full use/domain-client/full
 	@$(call set,KFLAVOURS,un-def)

-distro/regular-xfce-sysv: distro/.regular-sysv-gtk mixin/regular-xfce \
-	use/init/sysv/polkit use/deflogin/sysv/nm \
+mixin/regular-xfce-sysv: use/init/sysv/polkit use/deflogin/sysv/nm \
+	use/x11/lightdm/gtk \
+	use/browser/firefox use/browser/firefox/classic \
+	use/browser/firefox/i18n use/browser/firefox/h264 \
 	use/fonts/otf/adobe use/fonts/otf/mozilla
-	@$(call add,LIVE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
+	@$(call add,THE_PACKAGES,xfce4-mixer pm-utils elinks mpg123)
+
+distro/regular-xfce-sysv: distro/.regular-sysv-gtk \
+	mixin/regular-xfce mixin/regular-xfce-sysv; @:

 distro/regular-lxde: distro/.regular-gtk use/x11/lxde use/fonts/infinality \
 	use/x11/gtk/nm use/im +nm