regular.mk, pkg.in/lists: drop ConsoleKit

This one conflicts with systemd-logind; so let's move it
from generic pkglists into specific regular.mk targets
(those based on distro/.regular-sysv).
This commit is contained in:
Anton Midyukov 2018-02-09 16:10:25 +07:00 committed by Michael Shigorin
parent c4f9521e49
commit a1f539a724
7 changed files with 2 additions and 13 deletions

View File

@ -37,9 +37,10 @@ distro/.regular-desktop: distro/.regular-wm \
@$(call set,KFLAVOURS,std-def)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-sysv: distro/.regular-wm +sysvinit; @:
distro/.regular-sysv-gtk: distro/.regular-sysv use/syslinux/ui/gfxboot \
use/x11/gdm2.20; @:
distro/.regular-sysv: distro/.regular-wm +sysvinit
@$(call add,THE_PACKAGES,ConsoleKit ConsoleKit-x11 pam-ck-connector)
distro/.regular-install: distro/.regular-base +installer +sysvinit +power \
use/branding use/bootloader/grub use/luks \

View File

@ -1,3 +1,2 @@
cinnamon-regular
installer-feature-xdg-user-dirs
ConsoleKit

View File

@ -2,4 +2,3 @@ e17-default
evas_generic_loaders
gnome-icon-theme
terminology
ConsoleKit

View File

@ -3,4 +3,3 @@ evas_generic_loaders
gnome-icon-theme
rage
xterm
ConsoleKit

View File

@ -24,6 +24,3 @@ lxde-settings-lxdesktop
lxde-icon-theme
tango-icon-theme
# reboot/poweroff in logout menu as of July, 2013
ConsoleKit

View File

@ -39,6 +39,3 @@ psi-plus-plugin-birthdayreminder
psi-plus-plugin-conferencelogger
psi-plus-plugin-screenshot
psi-plus-plugin-watcher
# reboot/poweroff in logout menu as of May, 2014
ConsoleKit

View File

@ -7,9 +7,6 @@ fonts-otf-mozilla-fira
xdg-user-dirs
#gnome-minimal
#gnome-mobile
ConsoleKit
ConsoleKit-x11
pam-ck-connector
notification-daemon
#powermgmt-base
acpi