[PATCH] 3rd stopgap: m-i/plymouth

Michael Shigorin mike на altlinux.org
Ср Сен 19 12:37:19 MSK 2018


---
 conf.d/mixin.mk   |  2 +-
 conf.d/regular.mk | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/conf.d/mixin.mk b/conf.d/mixin.mk
index fdca52b..4ea44c3 100644
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -80,7 +80,7 @@ mixin/regular-tde: +tde \
 	@$(call add,DEFAULT_SERVICES_DISABLE,upower bluetoothd)
 
 mixin/regular-lxqt: use/x11/lxqt use/x11/sddm \
-	use/browser/falkon use/x11/gtk/nm +nm +plymouth
+	use/browser/falkon use/x11/gtk/nm +nm
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 
 # NB: never ever use/syslinux/ui/gfxboot here as gfxboot mangles
diff --git a/conf.d/regular.mk b/conf.d/regular.mk
index 924f7be..d16cefb 100644
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -36,7 +36,7 @@ distro/.regular-desktop: distro/.regular-wm \
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
 	@$(call set,KFLAVOURS,std-def)
 
-distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick +plymouth; @:
+distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/slick; @:
 distro/.regular-sysv: distro/.regular-wm +sysvinit \
 	use/init/sysv/consolekit; @:
 distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
@@ -159,7 +159,7 @@ distro/regular-cinnamon: distro/.regular-gtk use/x11/cinnamon \
 	@$(call add,THE_PACKAGES,thunderbird-ru)	### l10n
 
 # not .regular-gtk due to gdm vs lightdm
-distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
+distro/regular-gnome3: distro/.regular-desktop +nm \
 	use/x11/gnome3 use/browser/epiphany use/fonts/ttf/redhat
 	@$(call set,KFLAVOURS,un-def)
 	@$(call add,LIVE_PACKAGES,livecd-gnome3-setup-done)
@@ -167,7 +167,7 @@ distro/regular-gnome3: distro/.regular-desktop +plymouth +nm \
 	@$(call add,LIVE_PACKAGES,gnome-flashback screenpen)
 	@$(call add,DEFAULT_SERVICES_ENABLE,gdm)
 
-distro/regular-tde: distro/.regular-desktop mixin/regular-tde +plymouth \
+distro/regular-tde: distro/.regular-desktop mixin/regular-tde \
 	use/x11/gtk/nm use/net/nm/mmgui
 
 distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
@@ -175,7 +175,7 @@ distro/regular-tde-sysv: distro/.regular-sysv mixin/regular-tde \
 
 distro/regular-kde4: distro/.regular-desktop use/x11/kde4/nm use/x11/kdm4 \
 	use/browser/falkon use/fonts/zerg use/domain-client \
-	use/net/nm/mmgui +pulse +plymouth
+	use/net/nm/mmgui +pulse
 	@$(call add,THE_LISTS,$(call tags,regular kde4))
 	@$(call add,THE_PACKAGES,fonts-ttf-levien-inconsolata)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
@@ -189,7 +189,7 @@ distro/regular-lxqt-sysv: distro/.regular-sysv mixin/regular-lxqt \
 distro/regular-kde5: distro/.regular-desktop use/browser/falkon \
 	use/x11/kde5 use/x11/sddm use/domain-client \
 	use/fonts/ttf/google use/fonts/ttf/redhat use/fonts/zerg \
-	+nm +pulse +plymouth
+	+nm +pulse
 	@$(call add,THE_PACKAGES,kde5-telepathy falkon-kde5)
 	@$(call set,THE_IMAGEWRITER,rosa-imagewriter)
 
-- 
2.10.4


--MfFXiAuoTsnnDAfZ--


Подробная информация о списке рассылки Devel