Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Anton Palgunov
mkimage-profiles
Commits
22bb501a
Commit
22bb501a
authored
Jul 22, 2021
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
3 changed files
with
8 additions
and
5 deletions
+8
-5
mixin.mk
conf.d/mixin.mk
+1
-2
regular-vm.mk
conf.d/regular-vm.mk
+4
-2
regular.mk
conf.d/regular.mk
+3
-1
No files found.
conf.d/mixin.mk
View file @
22bb501a
...
...
@@ -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)
...
...
conf.d/regular-vm.mk
View file @
22bb501a
...
...
@@ -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::
...
...
conf.d/regular.mk
View file @
22bb501a
...
...
@@ -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; @:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment