[RESEND PATCH BlueZ] mesh-gatt: Fix JSON files missing from dist

[RESEND PATCH BlueZ] mesh-gatt: Fix JSON files missing from dist

[Bastien Nocera]

Moving EXTRA_DIST into a conditional means that if the dist isn't made
with the deprecated tools enabled, then files will be missing from the
distribution.

Fixes: 1f6553edd8a5 ("build: Deprecate meshctl tool")
---
 Makefile.tools | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Makefile.tools b/Makefile.tools
index f6de2e68551c..4a51762c3273 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -386,9 +386,8 @@ tools_meshctl_SOURCES = tools/meshctl.c \
 tools_meshctl_LDADD = gdbus/libgdbus-internal.la src/libshared-glib.la \
 				lib/libbluetooth-internal.la \
 				$(GLIB_LIBS) $(DBUS_LIBS) -ljson-c -lreadline
-
-EXTRA_DIST += tools/mesh-gatt/local_node.json tools/mesh-gatt/prov_db.json
 endif
+EXTRA_DIST += tools/mesh-gatt/local_node.json tools/mesh-gatt/prov_db.json
 
 bin_PROGRAMS +=  tools/mesh-cfgclient
 
-- 
2.53.0

RE: [RESEND,BlueZ] mesh-gatt: Fix JSON files missing from dist

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1311 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=1073069

---Test result---

Test Summary:
CheckPatch                    PENDING   0.32 seconds
GitLint                       PENDING   0.28 seconds
BuildEll                      PASS      20.01 seconds
BluezMake                     PASS      645.23 seconds
MakeCheck                     PASS      18.98 seconds
MakeDistcheck                 PASS      242.40 seconds
CheckValgrind                 PASS      288.85 seconds
CheckSmatch                   PASS      346.05 seconds
bluezmakeextell               PASS      181.27 seconds
IncrementalBuild              PENDING   0.38 seconds
ScanBuild                     PASS      1005.32 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



https://github.com/bluez/bluez/pull/1988/checks

---
Regards,
Linux Bluetooth

Re: [RESEND PATCH BlueZ] mesh-gatt: Fix JSON files missing from dist

[patchwork-bot+bluetooth]

Hello:

This patch was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Thu, 26 Mar 2026 17:24:48 +0100 you wrote:
> Moving EXTRA_DIST into a conditional means that if the dist isn't made
> with the deprecated tools enabled, then files will be missing from the
> distribution.
> 
> Fixes: 1f6553edd8a5 ("build: Deprecate meshctl tool")
> ---
>  Makefile.tools | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Here is the summary with links:
  - [RESEND,BlueZ] mesh-gatt: Fix JSON files missing from dist
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=0d4bb4421952

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html