Skip to content

M
mkimage-profiles
Commit 14f46ae7 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

drop use/x11/gdm2.20 (use wdm package instead)

gdm2.20 removed from Sisyphus: https://git.altlinux.org/tasks/archive/done/_353/361553/
parent d0967eb0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 12 deletions
conf.d/mixin.mk
View file @ 14f46ae7
...@@ -126,7 +126,6 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk ...@@ -126,7 +126,6 @@ mixin/regular-icewm: use/fonts/ttf/redhat +icewm +nm-gtk
@$(call add,THE_PACKAGES,icewm-startup-networkmanager) @$(call add,THE_PACKAGES,icewm-startup-networkmanager)
@$(call add,THE_PACKAGES,mnt) @$(call add,THE_PACKAGES,mnt)
# gdm2.20 can reboot/halt with both sysvinit and systemd, and is slim
mixin/regular-gnustep: use/x11/gnustep use/mediacheck mixin/regular-gnustep: use/x11/gnustep use/mediacheck
@$(call add,THE_BRANDING,graphics) @$(call add,THE_BRANDING,graphics)
......
conf.d/regular-vm.mk
View file @ 14f46ae7
...@@ -36,8 +36,9 @@ vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 \ ...@@ -36,8 +36,9 @@ vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 \
@$(call add,THE_PACKAGES,bluez) @$(call add,THE_PACKAGES,bluez)
@$(call try,VM_SIZE,8589934592) @$(call try,VM_SIZE,8589934592)
vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \ vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 \
use/init/sysv/polkit +power; @: use/init/sysv/polkit +power
@$(call add,THE_PACKAGES,wdm)
vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk
@$(call add,THE_PACKAGES,blueman) @$(call add,THE_PACKAGES,blueman)
......
conf.d/regular.mk
View file @ 14f46ae7
...@@ -72,9 +72,6 @@ distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: ...@@ -72,9 +72,6 @@ distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit +power; @: distro/.regular-desktop-sysv: distro/.regular-wm use/init/sysv/polkit +power; @:
distro/.regular-gtk-sysv: distro/.regular-desktop-sysv \
use/syslinux/ui/gfxboot use/x11/gdm2.20; @:
distro/.regular-install: distro/.regular-base +installer \ distro/.regular-install: distro/.regular-base +installer \
use/branding use/bootloader/grub use/luks use/stage2/kms \ use/branding use/bootloader/grub use/luks use/stage2/kms \
use/install2/fs use/install2/vnc use/install2/repo use/install2/fs use/install2/vnc use/install2/repo
...@@ -148,8 +145,9 @@ distro/regular-icewm: distro/.regular-desktop use/x11/lightdm/gtk \ ...@@ -148,8 +145,9 @@ distro/regular-icewm: distro/.regular-desktop use/x11/lightdm/gtk \
mixin/regular-icewm use/kernel/latest mixin/regular-icewm use/kernel/latest
@$(call add,THE_PACKAGES,icewm-startup-polkit-gnome) @$(call add,THE_PACKAGES,icewm-startup-polkit-gnome)
distro/regular-icewm-sysv: distro/.regular-gtk-sysv mixin/regular-icewm \ distro/regular-icewm-sysv: distro/.regular-desktop-sysv mixin/regular-icewm \
use/kernel/latest; @: use/live/autologin use/kernel/latest
@$(call add,LIVE_PACKAGES,wdm)
# wdm can't do autologin so add standalone one for livecd # wdm can't do autologin so add standalone one for livecd
distro/regular-wmaker-sysv: distro/.regular-desktop-sysv \ distro/regular-wmaker-sysv: distro/.regular-desktop-sysv \
......
features.in/x11/config.mk
View file @ 14f46ae7
...@@ -118,10 +118,6 @@ use/x11/lightdm/gtk use/x11/lightdm/slick use/x11/lightdm/kde\ ...@@ -118,10 +118,6 @@ use/x11/lightdm/gtk use/x11/lightdm/slick use/x11/lightdm/kde\
@$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter) @$(call set,THE_DISPLAY_MANAGER,lightdm-$*-greeter)
@$(call set,THE_DM_SERVICE,lightdm) @$(call set,THE_DM_SERVICE,lightdm)
use/x11/gdm2.20: \
use/x11/%: use/x11/dm
@$(call set,THE_DISPLAY_MANAGER,$*)
use/x11/kde-display-manager-lightdm: \ use/x11/kde-display-manager-lightdm: \
use/x11/%: use/x11/dm use/x11/%: use/x11/dm
ifeq (,$(filter-out sisyphus,$(BRANCH))) ifeq (,$(filter-out sisyphus,$(BRANCH)))
......
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