Skip to content

Commit

Permalink
build: ship all config files with --enable-datafiles
Browse files Browse the repository at this point in the history
Currently we ship only the dbus/systemd policy files and omit the other
four - /etc/bluetooth/{main,mesh-main,input,network}.conf.

Outside of those files, there is no documentation what the defaults are
and the other possible options. A number of distributions (Arch, Gentoo,
Fedora) have opted to manually copy those into the package. Alas this
does not scale and leaves other distros at disadvantage, in a sense.

Note: we need a custom install target to ensure confdir and statedir
have the correct permissions.
  • Loading branch information
evelikov-work authored and Vudentz committed Feb 13, 2024
1 parent 1313351 commit be0e796
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
8 changes: 7 additions & 1 deletion Makefile.am
Expand Up @@ -31,11 +31,17 @@ AM_LDFLAGS = $(MISC_LDFLAGS)
confdir = $(sysconfdir)/bluetooth
statedir = $(localstatedir)/lib/bluetooth

install-data-hook:
install -dm555 $(DESTDIR)$(confdir)
install -dm700 $(DESTDIR)$(statedir)

if DATAFILES
dbusdir = $(DBUS_CONFDIR)/dbus-1/system.d
dbus_DATA = src/bluetooth.conf

conf_DATA =
conf_DATA = src/main.conf
conf_DATA += profiles/input/input.conf
conf_DATA += profiles/network/network.conf
state_DATA =
endif

Expand Down
1 change: 1 addition & 0 deletions Makefile.mesh
Expand Up @@ -3,6 +3,7 @@ if MESH

if DATAFILES
dbus_DATA += mesh/bluetooth-mesh.conf
conf_DATA += mesh/mesh-main.conf
endif

if SYSTEMD
Expand Down

0 comments on commit be0e796

Please sign in to comment.