mixin.mk, regular-vm.mk: replace mixin/vm-archdep* to mixin.mk

These goals are not exclusive to the Regular's and will be useful to others.

mixin.mk, regular-vm.mk: replace mixin/vm-archdep* to mixin.mk
9f2c8172 · Anton Midyukov · 07f70ccf · 9f2c8172 · 9f2c8172
Commit 9f2c8172 authored Nov 29, 2023 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 33 additions and 33 deletions

mixin.mk conf.d/mixin.mk +33 -0

regular-vm.mk conf.d/regular-vm.mk +0 -33

No files found.
--- a/conf.d/mixin.mk
+++ b/conf.d/mixin.mk
@@ -37,6 +37,39 @@ mixin/e2k-mate: use/e2k/x11 use/x11/xorg use/fonts/install2 \
 	@$(call add,THE_PACKAGES,ethtool net-tools ifplugd)
 	@$(call add,THE_PACKAGES,zsh bash-completion)

+mixin/vm-archdep:: use/auto-resize; @:
+
+ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
+mixin/vm-archdep:: +efi
+ifeq (,$(filter-out p10,$(BRANCH)))
+	@$(call set,KFLAVOURS,un-def)
+else
+	@$(call set,KFLAVOURS,std-def un-def)
+endif
+endif
+
+ifeq (,$(filter-out armh,$(ARCH)))
+mixin/vm-archdep::
+	@$(call set,KFLAVOURS,un-def mp)
+endif
+
+
+ifeq (,$(filter-out armh aarch64,$(ARCH)))
+mixin/vm-archdep:: use/bootloader/uboot use/no-sleep use/arm-rpi4; @:
+endif
+
+ifeq (,$(filter-out mipsel,$(ARCH)))
+mixin/vm-archdep:: use/tty/S0
+	@$(call set,KFLAVOURS,un-malta)
+endif
+
+ifeq (,$(filter-out riscv64,$(ARCH)))
+mixin/vm-archdep:: use/bootloader/uboot
+	@$(call set,KFLAVOURS,un-def)
+endif
+
+mixin/vm-archdep-x11: mixin/vm-archdep use/vmguest/kvm/x11; @:
+
 ### regular.mk
 mixin/regular-x11: use/browser/firefox \
 	use/branding use/ntp/chrony use/services/lvm2-disable

--- a/conf.d/regular-vm.mk
+++ b/conf.d/regular-vm.mk
@@ -11,39 +11,6 @@ vm/regular-systemd: vm/systemd-net use/vmguest/kvm use/tty/S0 \
 	@$(call add,DEFAULT_SERVICES_DISABLE,consolesaver)
 #endif

-mixin/vm-archdep:: use/auto-resize; @:
-
-ifeq (,$(filter-out i586 x86_64 aarch64,$(ARCH)))
-mixin/vm-archdep:: +efi
-ifeq (,$(filter-out p10,$(BRANCH)))
-	@$(call set,KFLAVOURS,un-def)
-else
-	@$(call set,KFLAVOURS,std-def un-def)
-endif
-endif
-
-ifeq (,$(filter-out armh,$(ARCH)))
-mixin/vm-archdep::
-	@$(call set,KFLAVOURS,un-def mp)
-endif
-
-
-ifeq (,$(filter-out armh aarch64,$(ARCH)))
-mixin/vm-archdep:: use/bootloader/uboot use/no-sleep use/arm-rpi4; @:
-endif
-
-ifeq (,$(filter-out mipsel,$(ARCH)))
-mixin/vm-archdep:: use/tty/S0
-	@$(call set,KFLAVOURS,un-malta)
-endif
-
-ifeq (,$(filter-out riscv64,$(ARCH)))
-mixin/vm-archdep:: use/bootloader/uboot
-	@$(call set,KFLAVOURS,un-def)
-endif
-
-mixin/vm-archdep-x11: mixin/vm-archdep use/vmguest/kvm/x11; @:
-
 mixin/regular-vm-base: use/firmware use/ntp/chrony use/repo \
 	use/services/lvm2-disable use/wireless
 ifneq (,$(filter-out i586 x86_64,$(ARCH)))