Merge tag 'v1.5.15.2' into sisyphus

conf.d/mixin.mk

@@ -88,9 +88,6 @@ mixin/regular-desktop: +alsa +nm-native \
 	use/fonts/otf/adobe use/fonts/otf/mozilla use/branding/notes
 	@$(call set,LOCALES,en_US ru_RU pt_BR)
 	@$(call add,THE_PACKAGES,pam-limits-desktop beesu polkit dvd+rw-tools)
-ifeq (p10,$(BRANCH))
-	@$(call add,THE_PACKAGES,polkit-rule-admin-root)
-endif
 	@$(call add,THE_BRANDING,alterator graphics indexhtml)
 ifneq (,$(filter-out e2k%,$(ARCH)))
 	@$(call add,THE_BRANDING,notes)

conf.d/regular.mk

@@ -35,6 +35,7 @@ distro/.regular-x11: distro/.regular-base mixin/regular-x11 \
 	@$(call add,DEFAULT_SERVICES_DISABLE,gpm powertop)
 
 # Network install
+ifeq (,$(filter-out i586 x86_64 aarch64 ppc64le riscv64 loongarch64,$(ARCH)))
 distro/regular-net-install: distro/grub-net-install; @:
 ifeq (sisyphus,$(BRANCH))
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@@ -43,6 +44,7 @@ else
 	@$(call set,BOOTCHAIN_OEM_URL_NETINST,/sisyphus-$(ARCH)/snapshots/$(DATE)/regular-NAME-$(DATE)-$(ARCH).iso)
 endif
 endif
+endif
 
 # WM base target
 distro/.regular-wm: distro/.regular-x11 \
@@ -50,6 +52,9 @@ distro/.regular-wm: distro/.regular-x11 \
 	use/live/rw +live-installer
 	@$(call set,GRUB_DEFAULT,live)
 	@$(call set,SYSLINUX_DEFAULT,live)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,THE_PACKAGES,xorg-drv-vmware) # for virtualbox with VMSVGA
+endif
 
 # DE base target
 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
@@ -108,7 +113,12 @@ else
 	@$(call add,CLEANUP_PACKAGES,bridge-utils)
 endif
 	@$(call add,DEFAULT_SERVICES_DISABLE,fbsetfont)
-	@$(call add,INSTALL2_PACKAGES,xorg-dri-vmwgfx xorg-dri-virtio)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,INSTALL2_PACKAGES,xorg-dri-vmwgfx)
+endif
+ifneq (,$(filter-out e2k%,$(ARCH)))
+	@$(call add,INSTALL2_PACKAGES,xorg-dri-virtio)
+endif
 
 # NB:
 # - stock cleanup is not enough (or installer-common-stage3 deps soaring)

features.in/vmguest/config.mk

@@ -23,7 +23,8 @@ 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: ; @:
+use/vmguest/kvm/%: ; @:
 endif
 
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@@ -47,5 +48,6 @@ 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/vmware%: ; @:
+use/vmguest/vbox use/vmguest/vmware: ; @:
+use/vmguest/vbox/% use/vmguest/vmware/%: ; @:
 endif