Skip to content

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

vmguest: create dri subtargets from x11

This is useful for images with wayland only.
parent be1eee53
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 9 deletions
features.in/vmguest/config.mk
View file @ 155bf8a4
...@@ -6,8 +6,10 @@ use/vmguest: ...@@ -6,8 +6,10 @@ use/vmguest:
use/vmguest/bare: use/vmguest/vbox use/vmguest/kvm; @: use/vmguest/bare: use/vmguest/vbox use/vmguest/kvm; @:
use/vmguest/base: use/vmguest/bare use/vmguest/vmware; @: use/vmguest/base: use/vmguest/bare use/vmguest/vmware; @:
use/vmguest/complete: use/vmguest/base \ use/vmguest/dri: use/vmguest/vbox/dri use/vmguest/vmware/dri \
use/vmguest/vbox/x11 use/vmguest/vmware/x11 use/vmguest/kvm/x11; @: use/vmguest/kvm/dri; @:
use/vmguest/complete: use/vmguest/vbox/x11 use/vmguest/vmware/x11 \
use/vmguest/kvm/x11; @:
ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le riscv64,$(ARCH))) ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le riscv64,$(ARCH)))
# NB: only reasonable for X11-bearing images # NB: only reasonable for X11-bearing images
...@@ -15,9 +17,11 @@ ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le riscv64,$(ARCH))) ...@@ -15,9 +17,11 @@ ifeq (,$(filter-out i586 x86_64 aarch64 armh ppc64le riscv64,$(ARCH)))
use/vmguest/kvm: use/vmguest; @: use/vmguest/kvm: use/vmguest; @:
@$(call add,THE_PACKAGES,qemu-guest-agent) @$(call add,THE_PACKAGES,qemu-guest-agent)
use/vmguest/kvm/x11: use/vmguest/kvm use/vmguest/kvm/dri: use/vmguest
@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl)
@$(call add,THE_PACKAGES,xorg-dri-virtio) @$(call add,THE_PACKAGES,xorg-dri-virtio)
use/vmguest/kvm/x11: use/vmguest/kvm use/vmguest/kvm/dri
@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl)
else else
use/vmguest/kvm use/vmguest/kvm/x11: ; @: use/vmguest/kvm use/vmguest/kvm/x11: ; @:
endif endif
...@@ -25,17 +29,22 @@ endif ...@@ -25,17 +29,22 @@ endif
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
use/vmguest/vbox: use/vmguest; @: use/vmguest/vbox: use/vmguest; @:
use/vmguest/vbox/x11: use/vmguest/vbox use/vmguest/vbox/dri: use/vmguest
@$(call add,THE_KMODULES,drm) @$(call add,THE_KMODULES,drm)
@$(call add,THE_PACKAGES,virtualbox-guest-additions)
@$(call add,THE_PACKAGES,xorg-dri-vmwgfx) @$(call add,THE_PACKAGES,xorg-dri-vmwgfx)
use/vmguest/vbox/x11: use/vmguest/vbox use/vmguest/vbox/dri
@$(call add,THE_PACKAGES,virtualbox-guest-additions)
# see also use/install2/vmware # see also use/install2/vmware
use/vmguest/vmware: use/vmguest/vmware: use/vmguest
@$(call add,THE_PACKAGES,open-vm-tools) @$(call add,THE_PACKAGES,open-vm-tools)
use/vmguest/vmware/x11: use/vmguest/vmware use/vmguest/vmware/dri: use/vmguest
@$(call add,THE_PACKAGES,xorg-dri-vmwgfx xorg-drv-vmware xorg-drv-vmmouse) @$(call add,THE_PACKAGES,xorg-dri-vmwgfx)
use/vmguest/vmware/x11: use/vmguest/vmware use/vmguest/vmware/dri
@$(call add,THE_PACKAGES,xorg-drv-vmware xorg-drv-vmmouse)
@$(call add,THE_PACKAGES,open-vm-tools-desktop) @$(call add,THE_PACKAGES,open-vm-tools-desktop)
else else
use/vmguest/vbox use/vmguest/vbox/x11 \ use/vmguest/vbox use/vmguest/vbox/x11 \
......
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