Skip to content

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

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

Needed fix bluez. bluez not must require systemd-utils.
parent e057b43b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 5 deletions
conf.d/mixin.mk
View file @ 22bb501a
...@@ -69,9 +69,8 @@ ifneq (,$(filter-out e2k%,$(ARCH))) ...@@ -69,9 +69,8 @@ ifneq (,$(filter-out e2k%,$(ARCH)))
endif endif
@$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER)) @$(call add,THE_PACKAGES,$$(THE_IMAGEWRITER))
@$(call set,THE_IMAGEWRITER,altmediawriter) @$(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_DISABLE,gssd idmapd krb5kdc rpcbind)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
@$(call add,DEFAULT_SERVICES_ENABLE,cups) @$(call add,DEFAULT_SERVICES_ENABLE,cups)
@$(call add,DEFAULT_SERVICES_ENABLE,alteratord) @$(call add,DEFAULT_SERVICES_ENABLE,alteratord)
......
conf.d/regular-vm.mk
View file @ 22bb501a
...@@ -40,8 +40,10 @@ ifeq (,$(filter-out riscv64,$(ARCH))) ...@@ -40,8 +40,10 @@ ifeq (,$(filter-out riscv64,$(ARCH)))
mixin/regular-vm-x11:: use/oem/vnc; @: mixin/regular-vm-x11:: use/oem/vnc; @:
endif endif
vm/.regular-desktop:: vm/systemd mixin/regular-vm-x11 +systemd +systemd-optimal \ vm/.regular-desktop:: vm/systemd mixin/regular-vm-x11 \
+plymouth; @: +systemd +systemd-optimal +plymouth
@$(call add,THE_PACKAGES,bluez)
@$(call add,DEFAULT_SERVICES_ENABLE,bluetoothd)
ifeq (,$(filter-out armh aarch64,$(ARCH))) ifeq (,$(filter-out armh aarch64,$(ARCH)))
vm/.regular-desktop:: vm/.regular-desktop::
......
conf.d/regular.mk
View file @ 22bb501a
...@@ -36,7 +36,9 @@ distro/.regular-wm: distro/.regular-x11 \ ...@@ -36,7 +36,9 @@ distro/.regular-wm: distro/.regular-x11 \
# DE base target # DE base target
# TODO: use/plymouth/live when luks+plymouth is done, see also #28255 # TODO: use/plymouth/live when luks+plymouth is done, see also #28255
distro/.regular-desktop: distro/.regular-wm use/branding/full \ 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; @: distro/.regular-gtk: distro/.regular-desktop use/x11/lightdm/gtk +plymouth; @:
......
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