diff options
Diffstat (limited to 'pkgs/os-specific/linux/device-tree')
-rw-r--r-- | pkgs/os-specific/linux/device-tree/default.nix | 31 | ||||
-rw-r--r-- | pkgs/os-specific/linux/device-tree/raspberrypi.nix | 6 |
2 files changed, 26 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/device-tree/default.nix b/pkgs/os-specific/linux/device-tree/default.nix index 13d819a08a5..13c609cdf7d 100644 --- a/pkgs/os-specific/linux/device-tree/default.nix +++ b/pkgs/os-specific/linux/device-tree/default.nix @@ -1,16 +1,31 @@ -{ stdenvNoCC, dtc, findutils }: +{ lib, stdenvNoCC, dtc, findutils }: -with stdenvNoCC.lib; { - applyOverlays = (base: overlays: stdenvNoCC.mkDerivation { +with lib; { + applyOverlays = (base: overlays': stdenvNoCC.mkDerivation { name = "device-tree-overlays"; nativeBuildInputs = [ dtc findutils ]; buildCommand = let - quotedDtbos = concatMapStringsSep " " (o: "\"${toString o}\"") (toList overlays); + overlays = toList overlays'; in '' - for dtb in $(find ${base} -name "*.dtb" ); do - outDtb=$out/$(realpath --relative-to "${base}" "$dtb") - mkdir -p "$(dirname "$outDtb")" - fdtoverlay -o "$outDtb" -i "$dtb" ${quotedDtbos}; + mkdir -p $out + cd ${base} + find . -type f -name '*.dtb' -print0 \ + | 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 )" + + ${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 + fi + '')} + done ''; }); diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index 5a0d5710392..b4b40f8331f 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -1,4 +1,4 @@ -{ stdenvNoCC, raspberrypifw }: +{ lib, stdenvNoCC, raspberrypifw }: stdenvNoCC.mkDerivation { name = "raspberrypi-dtbs-${raspberrypifw.version}"; @@ -30,8 +30,8 @@ stdenvNoCC.mkDerivation { # Compatible overlays that may be used overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; - meta = with stdenvNoCC.lib; { - inherit (raspberrypifw.meta) platforms homepage license; + meta = with lib; { + inherit (raspberrypifw.meta) homepage license; description = "DTBs for the Raspberry Pi"; }; } |