Skip to content

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

Merge branch 'master' into sisyphus

parents feedd6d3 83120c87
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 8 deletions
features.in/vmguest/config.mk
View file @ 416a6354
...@@ -23,7 +23,7 @@ use/vmguest/kvm/dri: use/vmguest ...@@ -23,7 +23,7 @@ use/vmguest/kvm/dri: use/vmguest
use/vmguest/kvm/x11: use/vmguest/kvm use/vmguest/kvm/dri use/vmguest/kvm/x11: use/vmguest/kvm use/vmguest/kvm/dri
@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl) @$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl)
else else
use/vmguest/kvm use/vmguest/kvm/x11: ; @: use/vmguest/kvm%: ; @:
endif endif
ifeq (,$(filter-out i586 x86_64,$(ARCH))) ifeq (,$(filter-out i586 x86_64,$(ARCH)))
...@@ -47,8 +47,5 @@ use/vmguest/vmware/x11: use/vmguest/vmware use/vmguest/vmware/dri ...@@ -47,8 +47,5 @@ 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,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/vmware%: ; @:
use/vmguest/vbox/dri \
use/vmguest/vmware/dri \
use/vmguest/vmware use/vmguest/vmware/x11: ; @:
endif endif
pkg.in/lists/tagged/base+regular
View file @ 416a6354
...@@ -24,9 +24,7 @@ powertop@X86 ...@@ -24,9 +24,7 @@ powertop@X86
pciutils pciutils
usbutils usbutils
acpi acpi
dmidecode@X86 dmidecode@X86,aarch64,loongarch64
dmidecode@aarch64
dmidecode@loongarch64
apt-repo apt-repo
apt-rsync apt-rsync
......
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