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

mixin.mk, mobile.mk: separate u-boot specyfic to mixin targets

Browse Source
This commit is contained in:
Anton Midyukov 2024-04-11 14:25:11 +07:00
parent 33096c128c
commit 849c8e03c7
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conf.d/mixin.mk
View File

@ -64,6 +64,15 @@ endif
mixin/vm-archdep-x11: mixin/vm-archdep use/vmguest/kvm/x11; @: mixin/vm-archdep-x11: mixin/vm-archdep use/vmguest/kvm/x11; @:
mixin/uboot-extlinux: use/bootloader/uboot
@$(call set,EFI_BOOTLOADER,)
mixin/uboot-extlinux-efi: use/uboot +efi; @:
ifeq (aarch64,$(ARCH))
@$(call set,VM_PARTTABLE,msdos)
@$(call set,VM_BOOTTYPE,EFI)
endif
### regular.mk ### regular.mk
mixin/regular-x11: use/browser/firefox \ mixin/regular-x11: use/browser/firefox \
use/branding use/ntp/chrony use/services/lvm2-disable use/branding use/ntp/chrony use/services/lvm2-disable

12
conf.d/mobile.mk
View File

@ -45,21 +45,15 @@ vm/.phosh: vm/systemd mixin/mobile-base mixin/phosh +systemd \
@$(call add,THE_LISTS,mobile/apps) @$(call add,THE_LISTS,mobile/apps)
@$(call add,THE_PACKAGES,phosh-background-settings) @$(call add,THE_PACKAGES,phosh-background-settings)
vm/alt-mobile-phosh-un-def: vm/.phosh use/tty/S0 use/uboot +efi vm/alt-mobile-phosh-un-def: vm/.phosh mixin/uboot-extlinux-efi use/tty/S0
@$(call set,KFLAVOURS,un-def) @$(call set,KFLAVOURS,un-def)
ifeq (aarch64,$(ARCH))
@$(call set,VM_PARTTABLE,msdos)
@$(call set,VM_BOOTTYPE,EFI)
endif
ifeq (aarch64,$(ARCH)) ifeq (aarch64,$(ARCH))
mixin/mobile-pine: use/bootloader/uboot use/tty/S2 mixin/mobile-pine: mixin/uboot-extlinux use/tty/S2
@$(call set,EFI_BOOTLOADER,)
@$(call set,KFLAVOURS,pine) @$(call set,KFLAVOURS,pine)
@$(call add,THE_PACKAGES,alsa-ucm-conf-pinephone-pro-workaround) @$(call add,THE_PACKAGES,alsa-ucm-conf-pinephone-pro-workaround)
mixin/mobile-mp: use/bootloader/uboot use/tty/S0 mixin/mobile-mp: mixin/uboot-extlinux use/tty/S0
@$(call set,EFI_BOOTLOADER,)
@$(call set,KFLAVOURS,mp) @$(call set,KFLAVOURS,mp)
vm/alt-mobile-phosh-pine: vm/.phosh mixin/mobile-pine; @: vm/alt-mobile-phosh-pine: vm/.phosh mixin/mobile-pine; @: