From e315416e7b84ca8a5e1ce194e6c38618b0ed7184 Mon Sep 17 00:00:00 2001 From: Jasper Chan Date: Mon, 4 May 2026 11:12:07 -0700 Subject: [PATCH] raspberry/pi/4: disable compat checks when merging overlays --- raspberry-pi/4/apply-overlays-dtmerge.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/raspberry-pi/4/apply-overlays-dtmerge.nix b/raspberry-pi/4/apply-overlays-dtmerge.nix index ab6d5296..d40bcc49 100644 --- a/raspberry-pi/4/apply-overlays-dtmerge.nix +++ b/raspberry-pi/4/apply-overlays-dtmerge.nix @@ -27,17 +27,12 @@ with lib; | xargs -0 cp -v --no-preserve=mode --target-directory "$out" --parents for dtb in $(find "$out" -type f -name '*.dtb'); do - dtbCompat=$(fdtget -t s "$dtb" / compatible 2>/dev/null || true) # skip files without `compatible` string - test -z "$dtbCompat" && continue + fdtget -t s "$dtb" / compatible 2>/dev/null || continue ${flip (concatMapStringsSep "\n") overlays (o: '' - overlayCompat="$(fdtget -t s "${o.dtboFile}" / compatible)" - - # skip incompatible and non-matching overlays - if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then - echo "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" - elif ${ + # skip non-matching overlays + if ${ if ((o.filter or null) == null) then "false" else