Merge pull request #543 from ipetkov/fix-device-tree-overlays

raspberry-pi/4/dtmerge: fix application of overlays

raspberry-pi/4/apply-overlays-dtmerge.nix

@@ -24,15 +24,12 @@ with lib; (base: overlays': stdenvNoCC.mkDerivation {
       # skip incompatible and non-matching overlays
       if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then
         echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")"
-        continue
-      fi
-      ${optionalString ((o.filter or null) != null) ''
-      if [[ "''${dtb//${o.filter}/}" ==  "$dtb" ]]; then
-        echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")"
-        continue
-      fi
+      elif ${if ((o.filter or null) == null) then "false" else ''
+        [[ "''${dtb//${o.filter}/}" ==  "$dtb" ]]
       ''}
-
+      then
+        echo "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")"
+      else
         echo -n "Applying overlay ${o.name} to $(basename "$dtb")... "
         mv "$dtb"{,.in}
 
@@ -44,6 +41,7 @@ with lib; (base: overlays': stdenvNoCC.mkDerivation {
 
         echo "ok"
         rm "$dtb.in" "$dtboWithExt"
+      fi
       '')}
 
     done'';