stepchenkoas/mkimage-profiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
These goals are not exclusive to the Regular's and will be useful
to others.
This commit is contained in:
Anton Midyukov 2023-11-29 15:02:49 +07:00
parent 07f70ccff9
commit 9f2c8172f8
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
conf.d/mixin.mk
View File

@ -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

33
conf.d/regular-vm.mk
View File

@ -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)))