From 80c34ffad8d5f0120a9cd56e3ff8e07242c44e41 Mon Sep 17 00:00:00 2001 From: Michael Shigorin Date: Sun, 31 May 2015 16:52:40 +0300 Subject: [PATCH] regular.mk: moved openscada to regular-tde It's been added to al of tde-based images but it looks like LiveCDs make more sense, and it's the regular-tde.iso that hits both regular builds and starterkits; let's put it there and hope it gets spotted appropriately. --- conf.d/regular.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/regular.mk b/conf.d/regular.mk index 8a6e1dcf..a0470c04 100644 --- a/conf.d/regular.mk +++ b/conf.d/regular.mk @@ -150,11 +150,11 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ mixin/regular-tde: +tde \ use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat @$(call add,THE_PACKAGES,kdeedu) - @$(call add,THE_LISTS,openscada) @$(call add,DEFAULT_SERVICES_DISABLE,upower bluez) distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \ - use/x11/gtk/nm use/net/nm/mmgui; @: + use/x11/gtk/nm use/net/nm/mmgui + @$(call add,THE_LISTS,openscada) distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \ use/net-eth/dhcp use/efi/refind; @: