kernel-fitimage: Adjust order of dtb/dtbo files

The dtb files must be before the dtbo files, otherwise the overlays may
not be applied correctly.

From Bruce Ashfield:

  We can split between dtbs and dtbos, they just need to be sorted
  for reproducibility reasons.

  Of course, this was only working by luck previously (before the
  sort), since it has always been gathering dtbs and dtbo's with
  find, depending on filesystem ordering for the order in the
  fitimage).

Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/classes-recipe/kernel-fitimage.bbclass b/meta/classes-recipe/kernel-fitimage.bbclass
index 8ddebf8dd878a0557ec71d674c6552032a148de7..06cdc4f1ecaf7079cdb0cd2dd19c17e4b805b8e1 100644 (file)
--- a/meta/classes-recipe/kernel-fitimage.bbclass
+++ b/meta/classes-recipe/kernel-fitimage.bbclass
@@ -546,10 +546,11 @@ fitimage_assemble() {
 
        if [ -n "${EXTERNAL_KERNEL_DEVICETREE}" ]; then
                dtbcount=1
-               for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" \( -name '*.dtb' -o -name '*.dtbo' \) -printf '%P\n' | sort); do
+               for DTB in $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtb' -printf '%P\n' | sort) \
+               $(find "${EXTERNAL_KERNEL_DEVICETREE}" -name '*.dtbo' -printf '%P\n' | sort); do
                        DTB=$(echo "$DTB" | tr '/' '_')
 
-                       # Skip DTB if we've picked it up previously
+                       # Skip DTB/DTBO if we've picked it up previously
                        echo "$DTBS" | tr ' ' '\n' | grep -xq "$DTB" && continue
 
                        DTBS="$DTBS $DTB"