diff mbox series

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

Message ID 20240116-autofoo-v1-4-626f6b54bd06@gmail.com (mailing list archive)
State Superseded
Headers show
Series Autotools papercuts, linker GC, symlink dbus-org.bluez.obex.service | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/IncrementalBuild fail [BlueZ,04/10] build: remove dummy {conf,state}{dir,_DATA} tools/mgmt-tester.c: In function ‘main’: tools/mgmt-tester.c:12763:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 12763 | int main(int argc, char *argv[]) | ^~~~ unit/test-avdtp.c: In function ‘main’: unit/test-avdtp.c:766:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 766 | int main(int argc, char *argv[]) | ^~~~ unit/test-avrcp.c: In function ‘main’: unit/test-avrcp.c:989:5: note: variable tracking size limit exceeded with ‘-fvar-tracking-assignments’, retrying without 989 | int main(int argc, char *argv[]) | ^~~~ /usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/9/../../../x86_64-linux-gnu/Scrt1.o: in function `_start': (.text+0x24): undefined reference to `main' collect2: error: ld returned 1 exit status make[1]: *** [Makefile:5864: mesh/bluetooth-meshd] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:4674: all] Error 2

Commit Message

Emil Velikov via B4 Relay Jan. 16, 2024, 1:51 p.m. UTC
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(-)

Comments

Luiz Augusto von Dentz Jan. 16, 2024, 6:40 p.m. UTC | #1
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.
Emil Velikov Jan. 17, 2024, 8:39 a.m. UTC | #2
On Tue, 16 Jan 2024 at 18:40, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:

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

Thanks for the quick feedback Luiz.

Would be happy to help but need some details:
 - configure options used
 - autoconf, make, gcc(?) version
 - the error log

I did run all my patches through `git rebase -x "./bootstrap-config &&
make -j8 distcheck" origin/master` so any regressions are alarming.

OOC: Where is the code for the test bot that reports on the ML? I've
noticed that it flagged some unrelated issues [1], while not honouring
the "Reply-to:" header.

Thanks
Emil

[1] https://lore.kernel.org/linux-bluetooth/65a6a3a4.170a0220.86c5e.e719@mx.google.com/T/#m21808760ae29dae03e415e67c47b045daa461a6a
Emil Velikov Jan. 18, 2024, 4:12 p.m. UTC | #3
On Wed, 17 Jan 2024 at 08:39, Emil Velikov <emil.l.velikov@gmail.com> wrote:
>
> On Tue, 16 Jan 2024 at 18:40, Luiz Augusto von Dentz
> <luiz.dentz@gmail.com> wrote:
>
> >
> > This one seems to be causing some build regression, when trying to
> > apply it breaks the builds.
> >
>
> Thanks for the quick feedback Luiz.
>
> Would be happy to help but need some details:
>  - configure options used
>  - autoconf, make, gcc(?) version
>  - the error log
>

Just went through all the patches and they apply and build just fine.
Both in terms of "./bootstrap-configure && make distcheck" as well as
the Arch specific configure options as seen here [1].

Any pointers about the issue you're seeing and the platform in
question would be appreciated.

Thanks again,
Emil

[1] https://gitlab.archlinux.org/archlinux/packaging/packages/bluez/-/blob/main/PKGBUILD?ref_type=heads
Luiz Augusto von Dentz Jan. 18, 2024, 5:05 p.m. UTC | #4
Hi Emil,

On Thu, Jan 18, 2024 at 11:12 AM Emil Velikov <emil.l.velikov@gmail.com> wrote:
>
> On Wed, 17 Jan 2024 at 08:39, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> >
> > On Tue, 16 Jan 2024 at 18:40, Luiz Augusto von Dentz
> > <luiz.dentz@gmail.com> wrote:
> >
> > >
> > > This one seems to be causing some build regression, when trying to
> > > apply it breaks the builds.
> > >
> >
> > Thanks for the quick feedback Luiz.
> >
> > Would be happy to help but need some details:
> >  - configure options used
> >  - autoconf, make, gcc(?) version
> >  - the error log
> >
>
> Just went through all the patches and they apply and build just fine.
> Both in terms of "./bootstrap-configure && make distcheck" as well as
> the Arch specific configure options as seen here [1].
>
> Any pointers about the issue you're seeing and the platform in
> question would be appreciated.
>
> Thanks again,
> Emil
>
> [1] https://gitlab.archlinux.org/archlinux/packaging/packages/bluez/-/blob/main/PKGBUILD?ref_type=heads

/usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/
9/../../../x86_64-linux-gnu/Scrt1.o: in function `_start':
(.text+0x24): undefined reference to `main'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:5864: mesh/bluetooth-meshd] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:4674: all] Error 2

This might be due to using scan-build, anyway CI also run into the same problem:

https://github.com/BluezTestBot/bluez/pull/2010#issuecomment-1893971347
Emil Velikov Jan. 19, 2024, 11:09 a.m. UTC | #5
On Thu, 18 Jan 2024 at 17:05, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
>
> Hi Emil,
>
> On Thu, Jan 18, 2024 at 11:12 AM Emil Velikov <emil.l.velikov@gmail.com> wrote:
> >
> > On Wed, 17 Jan 2024 at 08:39, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> > >
> > > On Tue, 16 Jan 2024 at 18:40, Luiz Augusto von Dentz
> > > <luiz.dentz@gmail.com> wrote:
> > >
> > > >
> > > > This one seems to be causing some build regression, when trying to
> > > > apply it breaks the builds.
> > > >
> > >
> > > Thanks for the quick feedback Luiz.
> > >
> > > Would be happy to help but need some details:
> > >  - configure options used
> > >  - autoconf, make, gcc(?) version
> > >  - the error log
> > >
> >
> > Just went through all the patches and they apply and build just fine.
> > Both in terms of "./bootstrap-configure && make distcheck" as well as
> > the Arch specific configure options as seen here [1].
> >
> > Any pointers about the issue you're seeing and the platform in
> > question would be appreciated.
> >
> > Thanks again,
> > Emil
> >
> > [1] https://gitlab.archlinux.org/archlinux/packaging/packages/bluez/-/blob/main/PKGBUILD?ref_type=heads
>
> /usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/
> 9/../../../x86_64-linux-gnu/Scrt1.o: in function `_start':
> (.text+0x24): undefined reference to `main'
> collect2: error: ld returned 1 exit status
> make[1]: *** [Makefile:5864: mesh/bluetooth-meshd] Error 1
> make[1]: *** Waiting for unfinished jobs....
> make: *** [Makefile:4674: all] Error 2
>
> This might be due to using scan-build, anyway CI also run into the same problem:
>

Might be version/platform specific - `scan-build make -j2` works just
fine here. What are you using - distro, autoconf, clang/scan-build
version?

> https://github.com/BluezTestBot/bluez/pull/2010#issuecomment-1893971347
>

Hmm, I was wondering where the bot lives. Will take a closer look.

Thanks
Emil
Luiz Augusto von Dentz Jan. 19, 2024, 3:09 p.m. UTC | #6
Hi Emil, Tedd,

On Fri, Jan 19, 2024 at 6:09 AM Emil Velikov <emil.l.velikov@gmail.com> wrote:
>
> On Thu, 18 Jan 2024 at 17:05, Luiz Augusto von Dentz
> <luiz.dentz@gmail.com> wrote:
> >
> > Hi Emil,
> >
> > On Thu, Jan 18, 2024 at 11:12 AM Emil Velikov <emil.l.velikov@gmail.com> wrote:
> > >
> > > On Wed, 17 Jan 2024 at 08:39, Emil Velikov <emil.l.velikov@gmail.com> wrote:
> > > >
> > > > On Tue, 16 Jan 2024 at 18:40, Luiz Augusto von Dentz
> > > > <luiz.dentz@gmail.com> wrote:
> > > >
> > > > >
> > > > > This one seems to be causing some build regression, when trying to
> > > > > apply it breaks the builds.
> > > > >
> > > >
> > > > Thanks for the quick feedback Luiz.
> > > >
> > > > Would be happy to help but need some details:
> > > >  - configure options used
> > > >  - autoconf, make, gcc(?) version
> > > >  - the error log
> > > >
> > >
> > > Just went through all the patches and they apply and build just fine.
> > > Both in terms of "./bootstrap-configure && make distcheck" as well as
> > > the Arch specific configure options as seen here [1].
> > >
> > > Any pointers about the issue you're seeing and the platform in
> > > question would be appreciated.
> > >
> > > Thanks again,
> > > Emil
> > >
> > > [1] https://gitlab.archlinux.org/archlinux/packaging/packages/bluez/-/blob/main/PKGBUILD?ref_type=heads
> >
> > /usr/bin/ld: /usr/lib/gcc/x86_64-linux-gnu/
> > 9/../../../x86_64-linux-gnu/Scrt1.o: in function `_start':
> > (.text+0x24): undefined reference to `main'
> > collect2: error: ld returned 1 exit status
> > make[1]: *** [Makefile:5864: mesh/bluetooth-meshd] Error 1
> > make[1]: *** Waiting for unfinished jobs....
> > make: *** [Makefile:4674: all] Error 2
> >
> > This might be due to using scan-build, anyway CI also run into the same problem:
> >
>
> Might be version/platform specific - `scan-build make -j2` works just
> fine here. What are you using - distro, autoconf, clang/scan-build
> version?
>
> > https://github.com/BluezTestBot/bluez/pull/2010#issuecomment-1893971347
> >
>
> Hmm, I was wondering where the bot lives. Will take a closer look.

If I'm not mistaken it runs under a ubuntu VM under a github action,
@Tedd Ho-Jeong An can probably explain it better since he wrote the CI
integration, which btw we intend to move to BlueZ organization at some
point.

> Thanks
> Emil
diff mbox series

Patch

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