From ee62ba5afa33146cfdfd103dc38bf8db2c53f984 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Sun, 3 Nov 2024 20:17:32 +0300 Subject: [PATCH] regular-vm.mk: drop sysv desktop targets --- conf.d/regular-vm.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/conf.d/regular-vm.mk b/conf.d/regular-vm.mk index 92aedf89..952d56fb 100644 --- a/conf.d/regular-vm.mk +++ b/conf.d/regular-vm.mk @@ -36,10 +36,6 @@ vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 \ @$(call add,THE_PACKAGES,bluez) @$(call try,VM_SIZE,8589934592) -vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 \ - use/init/sysv/polkit +power - @$(call add,THE_PACKAGES,wdm) - vm/.regular-gtk: vm/.regular-desktop use/x11/lightdm/gtk @$(call add,THE_PACKAGES,blueman) @@ -56,7 +52,7 @@ vm/regular-jeos-sysv: vm/bare mixin/regular-vm-jeos mixin/vm-archdep +power; @: vm/regular-builder: vm/regular-jeos-systemd mixin/regular-builder +nm @$(call add,THE_PACKAGES,NetworkManager-tui) -vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \ +vm/regular-icewm: vm/.regular-gtk mixin/regular-icewm \ mixin/vm-archdep-x11; @: vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep-x11; @: @@ -114,7 +110,7 @@ vm/regular-jeos-sysv-tavolga: vm/bare mixin/regular-vm-jeos \ vm/regular-builder-tavolga: vm/regular-jeos-sysv-tavolga \ mixin/regular-builder; @: -vm/regular-icewm-sysv-tavolga: vm/.regular-desktop-sysv mixin/regular-icewm \ +vm/regular-icewm-tavolga: vm/.regular-gtk mixin/regular-icewm \ use/mipsel-mitx/x11; @: vm/regular-lxde-tavolga: vm/.regular-gtk mixin/regular-lxde \ @@ -141,7 +137,7 @@ vm/regular-jeos-sysv-bfk3: vm/bare mixin/regular-vm-jeos \ vm/regular-builder-bfk3: vm/regular-jeos-sysv-bfk3 \ mixin/regular-builder; @: -vm/regular-icewm-sysv-bfk3: vm/.regular-desktop-sysv mixin/regular-icewm \ +vm/regular-icewm-bfk3: vm/.regular-gtk mixin/regular-icewm \ use/mipsel-bfk3/x11; @: vm/regular-lxde-bfk3: vm/.regular-gtk mixin/regular-lxde \