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

mixin.mk, regular-vm.mk, regular.mk: not add bluetooth to desktop's with sysv

Browse Source 
Needed fix bluez. bluez not must require systemd-utils.
This commit is contained in:
Anton Midyukov 2021-07-22 18:03:07 +07:00
parent e057b43bd6
commit 22bb501a74
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf.d/mixin.mk
View File

@ -69,9 +69,8 @@ ifneq (,$(filter-out e2k%,$(ARCH)))
endif
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call set,THE_IMAGEWRITER,altmediawriter)
@$(call add,THE_PACKAGES,upower bluez udev-rules-rfkill-uaccess)
@$(call add,THE_PACKAGES,upower udev-rules-rfkill-uaccess)
@$(call add,DEFAULT_SERVICES_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call add,DEFAULT_SERVICES_ENABLE,cups)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord)

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

@ -40,8 +40,10 @@ ifeq (,$(filter-out riscv64,$(ARCH)))
mixin/regular-vm-x11:: use/oem/vnc; @:
endif
vm/.regular-desktop:: vm/systemd mixin/regular-vm-x11 +systemd +systemd-optimal \
+plymouth; @:
vm/.regular-desktop:: vm/systemd mixin/regular-vm-x11 \
+systemd +systemd-optimal +plymouth
@$(call add,THE_PACKAGES,bluez)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
ifeq (,$(filter-out armh aarch64,$(ARCH)))
vm/.regular-desktop::

4
conf.d/regular.mk
View File

@ -36,7 +36,9 @@ distro/.regular-wm: distro/.regular-x11 \
# DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-wm use/branding/full \
use/firmware/laptop +systemd +systemd-optimal; @:
use/firmware/laptop +systemd +systemd-optimal
@$(call add,THE_PACKAGES,bluez)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @: