diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2022-08-19 21:34:32 +0200 |
---|---|---|
committer | rnhmjoj <rnhmjoj@inventati.org> | 2022-08-20 13:34:14 +0200 |
commit | 916ca8f2b0c208def051f8ea9760c534a40309db (patch) | |
tree | d7cbae3f6c7ec0a2dd68b4c9fb5bf382abe043f9 | |
parent | 802ea456991723a936e302b91d004345482b569a (diff) | |
download | nixpkgs-916ca8f2b0c208def051f8ea9760c534a40309db.tar nixpkgs-916ca8f2b0c208def051f8ea9760c534a40309db.tar.gz nixpkgs-916ca8f2b0c208def051f8ea9760c534a40309db.tar.bz2 nixpkgs-916ca8f2b0c208def051f8ea9760c534a40309db.tar.lz nixpkgs-916ca8f2b0c208def051f8ea9760c534a40309db.tar.xz nixpkgs-916ca8f2b0c208def051f8ea9760c534a40309db.tar.zst nixpkgs-916ca8f2b0c208def051f8ea9760c534a40309db.zip |
nixos/hardware/device-tree: make overlays more reliable
This make the process of applying overlays more reliable by: 1. Ignoring dtb files that are not really device trees. [^1] 2. Adding a `filter` option (per-overlay, there already is a global one) to limit the files to which the overlay applies. This is useful in cases where the `compatible` string is ambiguous and multiple unrelated files match. Previously the script would fail in both cases. [^1]: For example, there is dtbs/overlays/overlay_map.dtb in the Raspberry Pi 1 kernel.
-rw-r--r-- | nixos/modules/hardware/device-tree.nix | 10 | ||||
-rw-r--r-- | pkgs/os-specific/linux/device-tree/default.nix | 35 |
2 files changed, 34 insertions, 11 deletions
diff --git a/nixos/modules/hardware/device-tree.nix b/nixos/modules/hardware/device-tree.nix index 55852776220..6204c0fddd0 100644 --- a/nixos/modules/hardware/device-tree.nix +++ b/nixos/modules/hardware/device-tree.nix @@ -14,6 +14,15 @@ let ''; }; + filter = mkOption { + type = types.nullOr types.str; + default = null; + example = "*rpi*.dtb"; + description = lib.mdDoc '' + Only apply to .dtb files matching glob expression. + ''; + }; + dtsFile = mkOption { type = types.nullOr types.path; description = lib.mdDoc '' @@ -165,6 +174,7 @@ in ''; type = types.listOf (types.coercedTo types.path (path: { name = baseNameOf path; + filter = null; dtboFile = path; }) overlayType); description = lib.mdDoc '' diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 88791a1fb1d..8b8cca911a9 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -8,22 +8,35 @@ with lib; { overlays = toList overlays'; in '' mkdir -p $out - cd ${base} + cd "${base}" find . -type f -name '*.dtb' -print0 \ - | xargs -0 cp -v --no-preserve=mode --target-directory $out --parents + | 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 )" + 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 ${flip (concatMapStringsSep "\n") overlays (o: '' - overlayCompat="$( fdtget -t s ${o.dtboFile} / compatible )" - # overlayCompat in dtbCompat - if [[ "$dtbCompat" =~ "$overlayCompat" ]]; then - echo "Applying overlay ${o.name} to $( basename $dtb )" - mv $dtb{,.in} - fdtoverlay -o "$dtb" -i "$dtb.in" ${o.dtboFile}; - rm $dtb.in + overlayCompat="$(fdtget -t s "${o.dtboFile}" / compatible)" + + # skip incompatible and non-matching overlays + if [[ ! "$dtbCompat" =~ "$overlayCompat" ]]; then + echo -n "Skipping overlay ${o.name}: incompatible with $(basename "$dtb")" + continue + fi + ${optionalString (o.filter != null) '' + if [[ "''${dtb//${o.filter}/}" == "$dtb" ]]; then + echo -n "Skipping overlay ${o.name}: filter does not match $(basename "$dtb")" + continue fi + ''} + + echo -n "Applying overlay ${o.name} to $(basename "$dtb")... " + mv "$dtb"{,.in} + fdtoverlay -o "$dtb" -i "$dtb.in" "${o.dtboFile}" + echo "ok" + rm "$dtb.in" '')} done |