[PATCH] device-tree.bbclass: Add support to compile overlays separately

[PATCH] device-tree.bbclass: Add support to compile overlays separately

[Jaewon Lee]

Currently only dts files are considered when looping through files to
compile. Modifying the loop to compile other files that are overlays.
Also surrounding this check with a try block as the function to find
overlays parses the file for a '/plugin/' tag, and there may be files in
the DT_FILES_PATH directory that are not parseable.

Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
---
 meta/classes/devicetree.bbclass | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/classes/devicetree.bbclass b/meta/classes/devicetree.bbclass
index 8fe5a5e..db10b86 100644
--- a/meta/classes/devicetree.bbclass
+++ b/meta/classes/devicetree.bbclass
@@ -120,9 +120,12 @@ python devicetree_do_compile() {
     includes = expand_includes("DT_INCLUDE", d)
     listpath = d.getVar("DT_FILES_PATH")
     for dts in os.listdir(listpath):
-        if not dts.endswith(".dts"):
-            continue # skip non-.dts files
         dtspath = os.path.join(listpath, dts)
+        try:
+            if not(os.path.isfile(dtspath)) or not(dts.endswith(".dts") or devicetree_source_is_overlay(dtspath)
+                continue # skip non-.dts files and non-overlay files
+        except:
+            continue # skip if can't determine if overlay
         devicetree_compile(dtspath, includes, d)
 }
 
-- 
2.7.5

Re: [PATCH] device-tree.bbclass: Add support to compile overlays separately

[Nathan Rossi]

On Fri, 14 Dec 2018 at 08:18, Jaewon Lee <jaewon.lee@xilinx.com> wrote:
>
> Currently only dts files are considered when looping through files to
> compile. Modifying the loop to compile other files that are overlays.
> Also surrounding this check with a try block as the function to find
> overlays parses the file for a '/plugin/' tag, and there may be files in
> the DT_FILES_PATH directory that are not parseable.
>
> Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
> Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
> Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
> ---
>  meta/classes/devicetree.bbclass | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/devicetree.bbclass b/meta/classes/devicetree.bbclass
> index 8fe5a5e..db10b86 100644
> --- a/meta/classes/devicetree.bbclass
> +++ b/meta/classes/devicetree.bbclass
> @@ -120,9 +120,12 @@ python devicetree_do_compile() {
>      includes = expand_includes("DT_INCLUDE", d)
>      listpath = d.getVar("DT_FILES_PATH")
>      for dts in os.listdir(listpath):
> -        if not dts.endswith(".dts"):
> -            continue # skip non-.dts files
>          dtspath = os.path.join(listpath, dts)
> +        try:
> +            if not(os.path.isfile(dtspath)) or not(dts.endswith(".dts") or devicetree_source_is_overlay(dtspath)

This is missing the trailing "):". Otherwise looks good.

Regards,
Nathan

> +                continue # skip non-.dts files and non-overlay files
> +        except:
> +            continue # skip if can't determine if overlay
>          devicetree_compile(dtspath, includes, d)
>  }
>
> --
> 2.7.5
>