Skip to content

M
mkimage-profiles
Commit 6df21fd8 authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Anton Midyukov
Browse files
Options

slinux: Move common part for vm/* to separate target

parent 573a2987
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
conf.d/slinux.mk
View file @ 6df21fd8
...@@ -16,10 +16,8 @@ endif ...@@ -16,10 +16,8 @@ endif
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
vm/slinux: vm/systemd use/x11/armsoc use/oem \ vm/slinux: use/slinux/vm-base use/bootloader/uboot; @:
use/bootloader/uboot use/slinux/mixin-base; @:
vm/slinux-tegra: vm/systemd use/x11/armsoc use/aarch64-tegra \ vm/slinux-tegra: use/slinux/vm-base use/aarch64-tegra; @:
use/oem use/slinux/mixin-base; @:
endif endif
endif endif
features.in/slinux/config.mk
View file @ 6df21fd8
...@@ -5,6 +5,9 @@ use/slinux: use/x11 ...@@ -5,6 +5,9 @@ use/slinux: use/x11
@$(call set,META_PUBLISHER,BaseALT Ltd) @$(call set,META_PUBLISHER,BaseALT Ltd)
@$(call set,META_VOL_SET,ALT) @$(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 \ 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 \ +nm use/x11/gtk/nm +systemd +wireless use/l10n/default/ru_RU \
use/xdg-user-dirs/deep; @: use/xdg-user-dirs/deep; @:
......
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