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")
---
Changes in v2:
- Fix SHA to have 12 characters, not 13
Makefile.tools | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Makefile.tools b/Makefile.tools
index 044342e29bc6..4178940bf066 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -378,9 +378,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.43.0
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=826174
---Test result---
Test Summary:
CheckPatch FAIL 0.61 seconds
GitLint PASS 0.32 seconds
BuildEll PASS 24.15 seconds
BluezMake PASS 735.22 seconds
MakeCheck PASS 12.09 seconds
MakeDistcheck PASS 165.29 seconds
CheckValgrind PASS 228.23 seconds
CheckSmatch PASS 333.63 seconds
bluezmakeextell PASS 108.61 seconds
IncrementalBuild PASS 691.98 seconds
ScanBuild PASS 974.78 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[[BlueZ,v2] ] mesh-gatt: Fix JSON files missing from dist
WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '1f6553edd8a5', maybe rebased or not pulled?
#52:
Fixes: 1f6553edd8a5 ("build: Deprecate meshctl tool")
/github/workspace/src/src/13557161.patch total: 0 errors, 1 warnings, 10 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/src/13557161.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth