Skip to content

Commit f34ca80

Browse files
committed
mnt/reform: stop doing ifd
1 parent ec18896 commit f34ca80

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

mnt/reform/kernel.nix

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,23 @@ let
3434
hash = "sha256-XiTuH40b3VJqzwygZzU0FcvMDj41Rq6IsMbm+3+QxDY=";
3535
};
3636

37-
kernelPatches =
38-
(map (patch: { inherit patch; }) (
39-
lib.filesystem.listFilesRecursive "${reformDebianPackages}/linux/patches${lib.versions.majorMinor modDirVersion}"
40-
))
41-
++ [
42-
{
43-
patch = callPackage ./dtsPatch.nix {
44-
inherit reformDebianPackages;
45-
kernelSource = src;
46-
};
47-
}
48-
];
37+
# Use postPatch to apply patches from a directory without IFD
38+
postPatch = ''
39+
for patch in ${reformDebianPackages}/linux/patches${lib.versions.majorMinor modDirVersion}/*/*.patch; do
40+
echo "Applying patch: $patch"
41+
patch -p1 < "$patch"
42+
done
43+
'';
44+
45+
kernelPatches = [
46+
{
47+
name = "reform-dts";
48+
patch = callPackage ./dtsPatch.nix {
49+
inherit reformDebianPackages;
50+
kernelSource = src;
51+
};
52+
}
53+
];
4954

5055
structuredExtraConfig = with lib.kernel; {
5156
# configuration options from https://source.mnt.re/reform/reform-debian-packages/-/blob/7f31ba3a6742d60d8d502c1d86e63ef5df3916bf/linux/config

0 commit comments

Comments
 (0)