image-wic-utils.bbclass: Support subdirectory parsing

Syntax for IMAGE_BOOT_FILES is <source>;<dest> where either or both
source can include a directory.  In the case of:

  devicetree/*.dtbo;devicetree/

The system will copy all of the contents (*.dtbo) from devicetree directory
and place it into a corresponding devicetree directory (using the same
filename) in the boot partition.

The code wasn't paying attention to this directory syntax, which caused
boot configuration errors.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 4 insertions, 1 deletions

diff --git a/meta-xilinx-core/classes/image-wic-utils.bbclass b/meta-xilinx-core/classes/image-wic-utils.bbclass
index 562f3263..41ad8148 100644
--- a/meta-xilinx-core/classes/image-wic-utils.bbclass
+++ b/meta-xilinx-core/classes/image-wic-utils.bbclass
@@ -21,7 +21,10 @@ def boot_files_split_expand(d):
         # for all sources, yield an entry
         for s in sources:
             if len(parts) == 2:
-                yield s, parts[1].strip()
+                if parts[1].endswith('/'):
+                    yield s, '%s%s' % (parts[1].strip(), s)
+                else:
+                    yield s, parts[1].strip()
             yield s, s
 
 def boot_files_bitstream(d):