Skip to content

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

regular-vm.mk: Simplify profiles

parent da918083
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 20 deletions
conf.d/regular-vm.mk
View file @ 272e94ae
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
mixin/vm-archdep:: ; @:
ifeq (,$(filter-out i586 x86_64 armh aarch64,$(ARCH)))
mixin/vm-archdep::
@$(call set,KFLAVOURS,un-def std-def)
endif
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; @:
else endif
ifeq (,$(filter-out mipsel,$(ARCH))) ifeq (,$(filter-out mipsel,$(ARCH)))
mixin/vm-archdep: use/tty/S0 mixin/vm-archdep:: use/tty/S0
@$(call set,KFLAVOURS,un-malta) @$(call set,KFLAVOURS,un-malta)
else endif
ifeq (,$(filter-out riscv64,$(ARCH))) ifeq (,$(filter-out riscv64,$(ARCH)))
mixin/vm-archdep: use/bootloader/uboot use/tty/S0 mixin/vm-archdep: use/bootloader/uboot use/tty/S0
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
else
mixin/vm-archdep: ; @:
endif
endif
endif
@$(call add,KMODULES,staging)
ifeq (,$(filter-out i586 x86_64 armh aarch64,$(ARCH)))
@$(call set,KFLAVOURS,un-def std-def)
endif endif
mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \ mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \
...@@ -27,25 +28,27 @@ ifneq (,$(filter-out i586 x86_64,$(ARCH))) ...@@ -27,25 +28,27 @@ ifneq (,$(filter-out i586 x86_64,$(ARCH)))
endif endif
@$(call add,THE_PACKAGES,bash-completion mc update-kernel) @$(call add,THE_PACKAGES,bash-completion mc update-kernel)
@$(call add,THE_PACKAGES,vim-console) @$(call add,THE_PACKAGES,vim-console)
@$(call add,KMODULES,staging)
mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root mixin/regular-vm-jeos: mixin/regular-vm-base use/deflogin/root
@$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1) @$(call add,DEFAULT_SERVICES_ENABLE,getty@tty1)
ifeq (,$(filter-out riscv64,$(ARCH))) mixin/regular-vm-x11:: mixin/regular-vm-base mixin/regular-x11 \
mixin/regular-vm-x11: mixin/regular-vm-base mixin/regular-x11 \
mixin/regular-desktop use/oem/vnc +wireless; @:
else
mixin/regular-vm-x11: mixin/regular-vm-base mixin/regular-x11 \
mixin/regular-desktop use/oem +wireless; @: mixin/regular-desktop use/oem +wireless; @:
ifeq (,$(filter-out riscv64,$(ARCH)))
mixin/regular-vm-x11:: use/oem/vnc; @:
endif endif
vm/.regular-desktop:: vm/systemd mixin/regular-vm-x11 +systemd +systemd-optimal \
+plymouth; @:
ifeq (,$(filter-out armh aarch64,$(ARCH))) ifeq (,$(filter-out armh aarch64,$(ARCH)))
vm/.regular-desktop::
@$(call add,THE_PACKAGES,xorg-96dpi) @$(call add,THE_PACKAGES,xorg-96dpi)
@$(call add,THE_LISTS,remote-access) @$(call add,THE_LISTS,remote-access)
endif endif
vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 +systemd +systemd-optimal \
+plymouth; @:
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/x11/gdm2.20 \
use/init/sysv/polkit +power; @: use/init/sysv/polkit +power; @:
......
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