diff --git a/conf.d/slinux.mk b/conf.d/slinux.mk index 57a6c020..211e0f53 100644 --- a/conf.d/slinux.mk +++ b/conf.d/slinux.mk @@ -16,10 +16,8 @@ endif ifeq (vm,$(IMAGE_CLASS)) ifeq (,$(filter-out aarch64 armh,$(ARCH))) -vm/slinux: vm/systemd use/x11/armsoc use/oem \ - use/bootloader/uboot use/slinux/mixin-base; @: +vm/slinux: use/slinux/vm-base use/bootloader/uboot; @: -vm/slinux-tegra: vm/systemd use/x11/armsoc use/aarch64-tegra \ - use/oem use/slinux/mixin-base; @: +vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra; @: endif endif diff --git a/features.in/slinux/config.mk b/features.in/slinux/config.mk index 70699df9..0464d348 100644 --- a/features.in/slinux/config.mk +++ b/features.in/slinux/config.mk @@ -5,6 +5,9 @@ use/slinux: use/x11 @$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_VOL_SET,ALT) +use/slinux/vm-base: vm/systemd use/x11/armsoc \ + use/oem use/repo use/slinux/mixin-base; @: + use/slinux/mixin-base: use/slinux use/x11/xorg use/x11/lightdm/gtk +pulse \ +nm use/x11/gtk/nm +systemd +wireless use/l10n/default/ru_RU \ use/xdg-user-dirs/deep; @: