Skip to content

M
mkimage-profiles
Commit 80c34ffa authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

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.
parent c17370da
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
conf.d/regular.mk
View file @ 80c34ffa
...@@ -150,11 +150,11 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \ ...@@ -150,11 +150,11 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
mixin/regular-tde: +tde \ mixin/regular-tde: +tde \
use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat use/syslinux/ui/gfxboot use/browser/firefox/classic use/fonts/ttf/redhat
@$(call add,THE_PACKAGES,kdeedu) @$(call add,THE_PACKAGES,kdeedu)
@$(call add,THE_LISTS,openscada)
@$(call add,DEFAULT_SERVICES_DISABLE,upower bluez) @$(call add,DEFAULT_SERVICES_DISABLE,upower bluez)
distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \ 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 \ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
use/net-eth/dhcp use/efi/refind; @: use/net-eth/dhcp use/efi/refind; @:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment