2021-10-18 10:56:08

by Geert Uytterhoeven

Subject: [PATCH 2/2] dt-bindings: Consider DT_SCHEMA_FILES when finding all json-schema

Setting DT_SCHEMA_FILES allows the user to restrict the
"dt_binding_check" make target to a specified set of DT binding files.
However, yamllint is still run on all available files, which not only
takes time, but also outputs warnings for other binding files the
developer is not interested in.

Fix this by renaming "find_cmd" to "find_all_cmd", introducing a new
"find_cmd" to only return the files specified by DT_SCHEMA_FILES (if
present), and using the latter for yamllint.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
v2:
- Introduce find_all_cmd,
- Only use the restricted set for yamllint.
---
Documentation/devicetree/bindings/Makefile | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile
index 6305cfa9495ed676..1a8c3ab9a538837a 100644
--- a/Documentation/devicetree/bindings/Makefile
+++ b/Documentation/devicetree/bindings/Makefile
@@ -22,23 +22,29 @@ $(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE
# Use full schemas when checking %.example.dts
DT_TMP_SCHEMA := $(obj)/processed-schema-examples.json

-find_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
+find_all_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
-name 'processed-schema*' ! \
-name '*.example.dt.yaml' \)

+ifeq ($(DT_SCHEMA_FILES),)
+find_cmd = $(find_all_cmd)
+else
+find_cmd = echo $(addprefix $(srctree)/, $(DT_SCHEMA_FILES))
+endif
+
quiet_cmd_yamllint = LINT $(src)
cmd_yamllint = ($(find_cmd) | \
xargs -n200 -P$$(nproc) $(DT_SCHEMA_LINT) -f parsable -c $(srctree)/$(src)/.yamllint >&2) || true

quiet_cmd_chk_bindings = CHKDT $@
- cmd_chk_bindings = ($(find_cmd) | \
+ cmd_chk_bindings = ($(find_all_cmd) | \
xargs -n200 -P$$(nproc) $(DT_DOC_CHECKER) -u $(srctree)/$(src)) || true

quiet_cmd_mk_schema = SCHEMA $@
cmd_mk_schema = f=$$(mktemp) ; \
$(if $(DT_MK_SCHEMA_FLAGS), \
printf '%s\n' $(real-prereqs), \
- $(find_cmd)) > $$f ; \
+ $(find_all_cmd)) > $$f ; \
$(DT_MK_SCHEMA) -j $(DT_MK_SCHEMA_FLAGS) @$$f > $@ ; \
rm -f $$f

@@ -48,7 +54,7 @@ define rule_chkdt
$(call cmd,mk_schema)
endef

-DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_cmd)))
+DT_DOCS = $(patsubst $(srctree)/%,%,$(shell $(find_all_cmd)))

override DTC_FLAGS := \
-Wno-avoid_unnecessary_addr_size \
--
2.25.1

2021-10-20 18:36:56

by Rob Herring (Arm)

Subject: Re: [PATCH 2/2] dt-bindings: Consider DT_SCHEMA_FILES when finding all json-schema

On Mon, 18 Oct 2021 12:54:48 +0200, Geert Uytterhoeven wrote:
> Setting DT_SCHEMA_FILES allows the user to restrict the
> "dt_binding_check" make target to a specified set of DT binding files.
> However, yamllint is still run on all available files, which not only
> takes time, but also outputs warnings for other binding files the
> developer is not interested in.
>
> Fix this by renaming "find_cmd" to "find_all_cmd", introducing a new
> "find_cmd" to only return the files specified by DT_SCHEMA_FILES (if
> present), and using the latter for yamllint.

We can also do the same thing on dt-doc-validate since checking and
preprocessing schemas are separate steps, so I did while applying.

>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> ---
> v2:
> - Introduce find_all_cmd,
> - Only use the restricted set for yamllint.
> ---
> Documentation/devicetree/bindings/Makefile | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>