Skip to content

M
mkimage-profiles
Commit 87a22774 authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

regular.mk: tde bits: move to mixin

distro/.regular-tde-extras is now mixin/regular-tde which pulls in several extra bits in addition to just the lists.
parent 3c61d471
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
conf.d/regular.mk
View file @ 87a22774
......@@ -74,16 +74,14 @@ distro/regular-cinnamon: distro/.regular-gtk \
distro/regular-gnome3: distro/.regular-desktop use/x11/gnome3 +plymouth; @:
# reusable bits
distro/.regular-tde-extras:
@$(call add,LIVE_PACKAGES,kdegames kdeedu)
@$(call add,LIVE_LISTS,openscada)
mixin/regular-tde: use/syslinux/ui/gfxboot +tde +plymouth
@$(call add,THE_PACKAGES,kdegames kdeedu)
@$(call add,THE_LISTS,openscada)
distro/regular-tde: distro/.regular-desktop distro/.regular-tde-extras \
+tde +plymouth +nm; @:
distro/regular-tde: distro/.regular-desktop mixin/regular-tde +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-tde-sysv: distro/.regular-sysv mixin/regular-tde \
use/net-eth/dhcp use/efi/refind; @:
distro/regular-kde4: distro/.regular-desktop use/x11/kde4 use/x11/kdm4 \
use/fonts/zerg +pulse +plymouth
......
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