Merge branch 'master' into sisyphus

features.in/vmguest/config.mk

@@ -23,7 +23,7 @@ use/vmguest/kvm/dri: use/vmguest
 use/vmguest/kvm/x11: use/vmguest/kvm use/vmguest/kvm/dri
 	@$(call add,THE_PACKAGES,spice-vdagent xorg-drv-qxl xorg-drv-spiceqxl)
 else
-use/vmguest/kvm use/vmguest/kvm/x11: ; @:
+use/vmguest/kvm%: ; @:
 endif
 
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@@ -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,open-vm-tools-desktop)
 else
-use/vmguest/vbox use/vmguest/vbox/x11 \
-use/vmguest/vbox/dri \
-use/vmguest/vmware/dri \
-use/vmguest/vmware use/vmguest/vmware/x11: ; @:
+use/vmguest/vbox% use/vmguest/vmware%: ; @:
 endif

pkg.in/lists/tagged/base+regular

@@ -24,9 +24,7 @@ powertop@X86
 pciutils
 usbutils
 acpi
-dmidecode@X86
-dmidecode@aarch64
-dmidecode@loongarch64
+dmidecode@X86,aarch64,loongarch64
 
 apt-repo
 apt-rsync