Re: [PATCH BlueZ 04/10] build: remove dummy {conf,state}{dir,_DATA}

Luiz Augusto von Dentz
2024-01-16T18:40:37Z

Hi Emil,

On Tue, Jan 16, 2024 at 8:52 AM Emil Velikov via B4 Relay
<devnull+emil.l.velikov.gmail.com@kernel.org> wrote:
>
> From: Emil Velikov <emil.velikov@collabora.com>
>
> The project does not install anything in the respective confdir and
> statedir(s). Since no files are installed, the respective folders are
> not created either - systemd will create them prior to starting the
> service(s).
>
> The *dir variables themselves are no longer used in *service.in, so
> remove everything.
> ---
> Makefile.am | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/Makefile.am b/Makefile.am
> index e738eb3a5..16d6bf160 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -28,15 +28,9 @@ AM_CFLAGS = $(MISC_CFLAGS) $(WARNING_CFLAGS) $(UDEV_CFLAGS) $(LIBEBOOK_CFLAGS) \
> $(LIBEDATASERVER_CFLAGS) $(ell_cflags)
> AM_LDFLAGS = $(MISC_LDFLAGS)
>
> -confdir = $(sysconfdir)/bluetooth
> -statedir = $(localstatedir)/lib/bluetooth
> -
> if DATAFILES
> dbusdir = $(DBUS_CONFDIR)/dbus-1/system.d
> dbus_DATA = src/bluetooth.conf
> -
> -conf_DATA =
> -state_DATA =
> endif
>
> if SYSTEMD
> @@ -747,9 +741,7 @@ MAINTAINERCLEANFILES = Makefile.in \
>
> SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
> $(SED) -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
> - -e 's,@libexecdir\@,$(libexecdir),g' \
> - -e 's,@statedir\@,$(statedir),g' \
> - -e 's,@confdir\@,$(confdir),g' \
> + -e 's,@libexecdir\@,$(libexecdir),g'
> < $< > $@
>
> if RUN_RST2MAN
>
> --
> 2.43.0

This one seems to be causing some build regression, when trying to
apply it breaks the builds.

--
Luiz Augusto von Dentz