Skip to content

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

regular-vm.mk: Set kflavours to std-def, un-def for aarch64, armh, X86

parent d6818e8c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
conf.d/regular-vm.mk
View file @ e4815d92
...@@ -2,7 +2,6 @@ ifeq (vm,$(IMAGE_CLASS)) ...@@ -2,7 +2,6 @@ ifeq (vm,$(IMAGE_CLASS))
ifeq (,$(filter-out armh aarch64,$(ARCH))) ifeq (,$(filter-out armh aarch64,$(ARCH)))
mixin/vm-archdep: use/bootloader/uboot use/no-sleep mixin/vm-archdep: use/bootloader/uboot use/no-sleep
@$(call set,KFLAVOURS,mp lts)
else else
ifeq (,$(filter-out mipsel,$(ARCH))) ifeq (,$(filter-out mipsel,$(ARCH)))
mixin/vm-archdep: use/tty/S0 mixin/vm-archdep: use/tty/S0
...@@ -17,6 +16,9 @@ endif ...@@ -17,6 +16,9 @@ endif
endif endif
endif endif
@$(call add,KMODULES,staging) @$(call add,KMODULES,staging)
ifeq (,$(filter-out i586 x86_64 armh aarch64,$(ARCH)))
@$(call set,KFLAVOURS,un-def std-def)
endif
mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \ mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \
use/services/lvm2-disable use/services/lvm2-disable
...@@ -74,6 +76,9 @@ vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep ...@@ -74,6 +76,9 @@ vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep
vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep
@$(call add,THE_PACKAGES,xfce-reduced-resource) @$(call add,THE_PACKAGES,xfce-reduced-resource)
ifeq (,$(filter-out armh aarch64,$(ARCH)))
@$(call set,KFLAVOURS,mp lts)
endif
vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep; @: vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep; @:
......
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