From 55cc52edcbb9537571fe9365ecd24c093c4882b3 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Fri, 16 Aug 2024 21:51:35 +0300 Subject: [PATCH] mobile.mk: build with AD, if BRANCH!=sisyphus; drop targets with -ad suffix Active Directory support is required on stable branches only. --- conf.d/mobile.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/conf.d/mobile.mk b/conf.d/mobile.mk index 63967526..81ac2f9e 100644 --- a/conf.d/mobile.mk +++ b/conf.d/mobile.mk @@ -5,7 +5,7 @@ ifneq (,$(filter-out riscv64,$(ARCH))) @$(call add,DEFAULT_SYSTEMD_SERVICES_ENABLE,hkdm) 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/root use/l10n/ru_RU use/xdg-user-dirs \ use/drm use/firmware mixin/ttyescape +plymouth +pipewire \ @@ -35,8 +35,10 @@ mixin/phosh: use/services +nm-gtk4 +nm-native @$(call set,DEFAULT_SESSION,phosh) @$(call add,THE_PACKAGES,dconf-epiphany-mobile-user-agent) -mixin/mobile-ad: +ifneq (sisyphus,$(BRANCH)) +mixin/mobile-base:: @$(call add,THE_LISTS,mobile/AD) +endif ifeq (vm,$(IMAGE_CLASS)) vm/.phosh: vm/systemd mixin/mobile-base mixin/phosh +systemd \ @@ -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-nxp: vm/.phosh mixin/mobile-nxp; @: 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