Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit ba5dd0fe authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

regular-vm.mk: add +vmguest for nonspecific regulars image with desktop

These images also launch in virtual machines.
parent 6b2643b9
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
conf.d/regular-vm.mk
View file @ ba5dd0fe
...@@ -21,6 +21,8 @@ mixin/vm-archdep:: use/bootloader/uboot ...@@ -21,6 +21,8 @@ mixin/vm-archdep:: use/bootloader/uboot
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
endif endif
mixin/vm-archdep-x11: mixin/vm-archdep +vmguest; @:
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
ifneq (,$(filter-out i586 x86_64,$(ARCH))) ifneq (,$(filter-out i586 x86_64,$(ARCH)))
...@@ -74,27 +76,27 @@ vm/regular-jeos-sysv: vm/bare mixin/regular-vm-jeos mixin/vm-archdep +power; @: ...@@ -74,27 +76,27 @@ 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; @: vm/regular-builder: vm/regular-jeos-systemd mixin/regular-builder +nm; @:
vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \ vm/regular-icewm-sysv: vm/.regular-desktop-sysv mixin/regular-icewm \
mixin/vm-archdep; @: mixin/vm-archdep-x11; @:
vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep; @: vm/regular-cinnamon: vm/.regular-gtk mixin/regular-cinnamon mixin/vm-archdep-x11; @:
vm/regular-deepin: vm/.regular-gtk mixin/regular-deepin mixin/vm-archdep; @: vm/regular-deepin: vm/.regular-gtk mixin/regular-deepin mixin/vm-archdep-x11; @:
vm/regular-gnome3: vm/.regular-gtk mixin/regular-gnome3 mixin/vm-archdep vm/regular-gnome3: vm/.regular-gtk mixin/regular-gnome3 mixin/vm-archdep-x11
@$(call set,VM_SIZE,8589934592) @$(call set,VM_SIZE,8589934592)
vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep; @: vm/regular-lxde: vm/.regular-gtk mixin/regular-lxde mixin/vm-archdep-x11; @:
vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep vm/regular-mate: vm/.regular-gtk mixin/mate-base mixin/vm-archdep-x11
@$(call add,THE_PACKAGES,mate-reduced-resource) @$(call add,THE_PACKAGES,mate-reduced-resource)
vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep vm/regular-xfce: vm/.regular-gtk mixin/regular-xfce mixin/vm-archdep-x11
@$(call add,THE_PACKAGES,xfce-reduced-resource) @$(call add,THE_PACKAGES,xfce-reduced-resource)
vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep vm/regular-kde5: vm/.regular-gtk mixin/regular-kde5 mixin/vm-archdep-x11
@$(call set,VM_SIZE,7516192768) @$(call set,VM_SIZE,7516192768)
vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep; @: vm/regular-lxqt: vm/.regular-gtk mixin/regular-lxqt mixin/vm-archdep-x11; @:
ifeq (,$(filter-out aarch64 armh,$(ARCH))) ifeq (,$(filter-out aarch64 armh,$(ARCH)))
# Raspberry Pi 4 # Raspberry Pi 4
......
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