Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit 55cc52ed authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

mobile.mk: build with AD, if BRANCH!=sisyphus; drop targets with -ad suffix

Active Directory support is required on stable branches only.
parent 75dc91e7
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
conf.d/mobile.mk
View file @ 55cc52ed
...@@ -5,7 +5,7 @@ ifneq (,$(filter-out riscv64,$(ARCH))) ...@@ -5,7 +5,7 @@ ifneq (,$(filter-out riscv64,$(ARCH)))
@$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,hkdm) @$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,hkdm)
endif endif
mixin/mobile-base: use/ntp/chrony use/repo use/branding/notes use/x11-autostart \ mixin/mobile-base:: use/ntp/chrony use/repo use/branding/notes use/x11-autostart \
use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \ use/deflogin/privileges use/deflogin/xgrp use/deflogin/hardware \
use/deflogin/root use/l10n/ru_RU use/xdg-user-dirs \ use/deflogin/root use/l10n/ru_RU use/xdg-user-dirs \
use/drm use/firmware mixin/ttyescape +plymouth +pipewire \ use/drm use/firmware mixin/ttyescape +plymouth +pipewire \
...@@ -35,8 +35,10 @@ mixin/phosh: use/services +nm-gtk4 +nm-native ...@@ -35,8 +35,10 @@ mixin/phosh: use/services +nm-gtk4 +nm-native
@$(call set,DEFAULT_SESSION,phosh) @$(call set,DEFAULT_SESSION,phosh)
@$(call add,THE_PACKAGES,dconf-epiphany-mobile-user-agent) @$(call add,THE_PACKAGES,dconf-epiphany-mobile-user-agent)
mixin/mobile-ad: ifneq (sisyphus,$(BRANCH))
mixin/mobile-base::
@$(call add,THE_LISTS,mobile/AD) @$(call add,THE_LISTS,mobile/AD)
endif
ifeq (vm,$(IMAGE_CLASS)) ifeq (vm,$(IMAGE_CLASS))
vm/.phosh: vm/systemd mixin/mobile-base mixin/phosh +systemd \ vm/.phosh: vm/systemd mixin/mobile-base mixin/phosh +systemd \
...@@ -78,12 +80,5 @@ vm/alt-mobile-phosh-mp: vm/.phosh mixin/mobile-mp; @: ...@@ -78,12 +80,5 @@ vm/alt-mobile-phosh-mp: vm/.phosh mixin/mobile-mp; @:
vm/alt-mobile-phosh-lt11i: vm/.phosh mixin/mobile-lt11i; @: vm/alt-mobile-phosh-lt11i: vm/.phosh mixin/mobile-lt11i; @:
vm/alt-mobile-phosh-nxp: vm/.phosh mixin/mobile-nxp; @: vm/alt-mobile-phosh-nxp: vm/.phosh mixin/mobile-nxp; @:
vm/alt-mobile-phosh-rocknix: vm/.phosh mixin/mobile-rocknix; @: vm/alt-mobile-phosh-rocknix: vm/.phosh mixin/mobile-rocknix; @:
# AD
vm/alt-mobile-phosh-pine-ad: vm/alt-mobile-phosh-pine mixin/mobile-ad; @:
vm/alt-mobile-phosh-mp-ad: vm/alt-mobile-phosh-mp mixin/mobile-ad; @:
vm/alt-mobile-phosh-lt11i-ad: vm/alt-mobile-phosh-lt11i mixin/mobile-ad; @:
vm/alt-mobile-phosh-nxp-ad: vm/alt-mobile-phosh-nxp mixin/mobile-ad; @:
vm/alt-mobile-phosh-rocknix-ad: vm/alt-mobile-phosh-rocknix mixin/mobile-ad; @:
endif endif
endif endif
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