regular-vm.mk: Remove specific to aarch64 and armh in .regular-desktop

Reducing the size of the image is relevant for all architectures, and everything else is no longer needed.

regular-vm.mk: Remove specific to aarch64 and armh in .regular-desktop
3f01a223 · Anton Midyukov · 2c53c196 · 3f01a223
Commit 3f01a223 authored Jan 23, 2023 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

regular-vm.mk conf.d/regular-vm.mk +1 -7

No files found.
--- a/conf.d/regular-vm.mk
+++ b/conf.d/regular-vm.mk
@@ -62,18 +62,12 @@ ifeq (,$(filter-out riscv64,$(ARCH)))
 mixin/regular-vm-x11:: use/oem/vnc; @:
 endif

-vm/.regular-desktop:: vm/systemd mixin/regular-vm-x11 \
+vm/.regular-desktop: vm/systemd mixin/regular-vm-x11 \
 	+systemd +systemd-optimal +plymouth
 	@$(call add,THE_PACKAGES,bluez)
 	@$(call add,THE_PACKAGES,glmark2 glmark2-es2)
 	@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
-
-ifeq (,$(filter-out armh aarch64,$(ARCH)))
-vm/.regular-desktop::
-	@$(call add,THE_PACKAGES,xorg-96dpi)
-	@$(call add,THE_LISTS,remote-access)
 	@$(call try,VM_SIZE,6442450944)
-endif

 vm/.regular-desktop-sysv: vm/bare mixin/regular-vm-x11 use/x11/gdm2.20 \
 	use/init/sysv/polkit +power; @: