devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] dt-bindings: Fix generated example files getting added to schemas
@ 2019-07-30 14:59 Rob Herring
  2019-07-30 15:42 ` Guido Günther
  0 siblings, 1 reply; 2+ messages in thread
From: Rob Herring @ 2019-07-30 14:59 UTC (permalink / raw)
  To: devicetree; +Cc: linux-kernel, Guido Günther

Commit 837158b847a4 ("dt-bindings: Check the examples against the
schemas") started generating YAML encoded DT files to validate the
examples against the schema. When running 'make dt_binding_check' in
tree after the 1st time, the generated example .dt.yaml files are
mistakenly added to the list of schema files. Exclude *.example.dt.yaml
files from the search for schema files.

Fixes: 837158b847a4 ("dt-bindings: Check the examples against the schemas")
Reported-by: Guido Günther <agx@sigxcpu.org>
Signed-off-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile
index 6b0dfd5c17ba..5138a2f6232a 100644
--- a/Documentation/devicetree/bindings/Makefile
+++ b/Documentation/devicetree/bindings/Makefile
@@ -19,7 +19,9 @@ quiet_cmd_mk_schema = SCHEMA  $@
 
 DT_DOCS = $(shell \
 	cd $(srctree)/$(src) && \
-	find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \
+	find * \( -name '*.yaml' ! \
+		-name $(DT_TMP_SCHEMA) ! \
+		-name '*.example.dt.yaml' \) \
 	)
 
 DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))
-- 
2.20.1

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] dt-bindings: Fix generated example files getting added to schemas
  2019-07-30 14:59 [PATCH] dt-bindings: Fix generated example files getting added to schemas Rob Herring
@ 2019-07-30 15:42 ` Guido Günther
  0 siblings, 0 replies; 2+ messages in thread
From: Guido Günther @ 2019-07-30 15:42 UTC (permalink / raw)
  To: Rob Herring; +Cc: devicetree, linux-kernel

Hi,
On Tue, Jul 30, 2019 at 08:59:35AM -0600, Rob Herring wrote:
> Commit 837158b847a4 ("dt-bindings: Check the examples against the
> schemas") started generating YAML encoded DT files to validate the
> examples against the schema. When running 'make dt_binding_check' in
> tree after the 1st time, the generated example .dt.yaml files are
> mistakenly added to the list of schema files. Exclude *.example.dt.yaml
> files from the search for schema files.
> 
> Fixes: 837158b847a4 ("dt-bindings: Check the examples against the schemas")
> Reported-by: Guido Günther <agx@sigxcpu.org>
> Signed-off-by: Rob Herring <robh@kernel.org>
> ---
>  Documentation/devicetree/bindings/Makefile | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile
> index 6b0dfd5c17ba..5138a2f6232a 100644
> --- a/Documentation/devicetree/bindings/Makefile
> +++ b/Documentation/devicetree/bindings/Makefile
> @@ -19,7 +19,9 @@ quiet_cmd_mk_schema = SCHEMA  $@
>  
>  DT_DOCS = $(shell \
>  	cd $(srctree)/$(src) && \
> -	find * \( -name '*.yaml' ! -name $(DT_TMP_SCHEMA) \) \
> +	find * \( -name '*.yaml' ! \
> +		-name $(DT_TMP_SCHEMA) ! \
> +		-name '*.example.dt.yaml' \) \
>  	)
>  
>  DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))


this fixes checking twice in a row for me. Thanks!

Tested-by: Guido Günther <agx@sigxcpu.org>

 -- Guido

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-07-30 15:42 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-30 14:59 [PATCH] dt-bindings: Fix generated example files getting added to schemas Rob Herring
2019-07-30 15:42 ` Guido Günther

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).