Skip to content

M
mkimage-profiles
Commit eca38a1f authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

mobile.mk: separate mixin/mobile-def from vm/phosh-def

For reuse.
parent f5d2e95a
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
conf.d/mobile.mk
View file @ eca38a1f
...@@ -36,6 +36,12 @@ endif ...@@ -36,6 +36,12 @@ endif
@$(call add,CONTROL,passwdqc-min:allow_pincode) @$(call add,CONTROL,passwdqc-min:allow_pincode)
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,waked.service) @$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,waked.service)
ifeq (sisyphus,$(BRANCH))
mixin/mobile-def: mixin/uboot-extlinux-efi use/tty/S0; @:
else
mixin/mobile-def: mixin/uboot-extlinux-efi; @:
endif
mixin/phosh: use/services +nm-gtk4 +nm-native mixin/phosh: use/services +nm-gtk4 +nm-native
@$(call add,THE_BRANDING,phosh-settings) @$(call add,THE_BRANDING,phosh-settings)
@$(call add,THE_LISTS,mobile/phosh) @$(call add,THE_LISTS,mobile/phosh)
...@@ -54,11 +60,7 @@ vm/.phosh: vm/systemd mixin/mobile-base mixin/phosh +systemd \ ...@@ -54,11 +60,7 @@ vm/.phosh: vm/systemd mixin/mobile-base mixin/phosh +systemd \
mixin/waydroid use/fonts/ttf/google \ mixin/waydroid use/fonts/ttf/google \
use/auto-resize; @: use/auto-resize; @:
ifeq (sisyphus,$(BRANCH)) vm/alt-mobile-phosh-def: vm/.phosh mixin/mobile-def; @:
vm/alt-mobile-phosh-def: vm/.phosh mixin/uboot-extlinux-efi use/tty/S0; @:
else
vm/alt-mobile-phosh-def: vm/.phosh mixin/uboot-extlinux-efi; @:
endif
ifeq (aarch64,$(ARCH)) ifeq (aarch64,$(ARCH))
ifeq (sisyphus,$(BRANCH)) ifeq (sisyphus,$(BRANCH))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment