From e00d46cf97da6dbae0656e87a0840964a1c0e3eb Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Mon, 10 Mar 2014 21:48:54 +0400 Subject: [PATCH] regular.mk: added regular-e18-sysv.iso It's preliminary but rather working by now; one of the main woes is #29497 so far. xterm has been overduplicated, moved to pkglists for clarity. --- conf.d/regular.mk | 8 +++----- pkg.in/lists/tagged/desktop+e17 | 1 + pkg.in/lists/tagged/desktop+e18 | 1 + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 3809d450..c0c59b19 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -98,11 +98,9 @@ distro/regular-xmonad: distro/.regular-gtk use/x11/xmonad distro/regular-mate: distro/.regular-gtk use/x11/mate +nm @$(call add,LIVE_LISTS,$(call tags,mobile mate)) -distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality - @$(call add,LIVE_PACKAGES,xterm) - -distro/regular-e18: distro/.regular-gtk use/x11/e18 use/fonts/infinality - @$(call add,LIVE_PACKAGES,xterm) +distro/regular-e17: distro/.regular-gtk use/x11/e17 use/fonts/infinality; @: +distro/regular-e18: distro/.regular-gtk use/x11/e18 use/fonts/infinality; @: +distro/regular-e18-sysv: distro/.regular-sysv-gtk use/x11/e18; @: distro/regular-cinnamon: distro/.regular-gtk \ use/x11/cinnamon use/fonts/infinality diff --git a/pkg.in/lists/tagged/desktop+e17 b/pkg.in/lists/tagged/desktop+e17 index fc7e95a2..0d5f9a56 100644 --- a/pkg.in/lists/tagged/desktop+e17 +++ b/pkg.in/lists/tagged/desktop+e17 @@ -2,3 +2,4 @@ e17-default evas_generic_loaders gnome-icon-theme e17-extra-modules +xterm diff --git a/pkg.in/lists/tagged/desktop+e18 b/pkg.in/lists/tagged/desktop+e18 index 92417758..8418f4af 100644 --- a/pkg.in/lists/tagged/desktop+e18 +++ b/pkg.in/lists/tagged/desktop+e18 @@ -1,3 +1,4 @@ e18-default evas_generic_loaders1.8 gnome-icon-theme +xterm