JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "linuxPackages_4_{19,20}: works around bug with overlayfs."

Browse Source 
This reverts commit de86af48faa03a824917ac90f4776481c7ce9e54.

(Manual revert due to conflicts.)

See #54509

The patch is causing overlayfs to misbehave.
This commit is contained in:
Samuel Dionne-Riel 2019-02-02 12:12:11 -05:00
parent 3b698b537c
commit 196af4b359
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/kernel/patches.nix
View File

@ -58,14 +58,11 @@ rec {
};
};
# Reverts a change related to the overlayfs overhaul in 4.19
# https://github.com/NixOS/nixpkgs/issues/48828#issuecomment-445208626
revert-vfs-dont-open-real = rec {
name = "revert-vfs-dont-open-real";
raspberry_pi_wifi_fix = rec {
name = "raspberry-pi-wifi-fix";
patch = fetchpatch {
name = name + ".patch";
url = https://github.com/samueldr/linux/commit/ee23fa215caaa8102f4ab411d39fcad5858147f2.patch;
sha256 = "0bp4jryihg1y2sl8zlj6w7vvnxj0kmb6xdy42hpvdv43kb6ngiaq";
url = https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/730522ae76aa57b89fa317c5084613d3d50cf3b8/core/linux-aarch64/0005-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-pr.patch;
sha256 = "0gbfycky28vbdjgys1z71wl5q073dmbrkvbnr6693jsda3qhp6za";
};
};
}

3
pkgs/top-level/all-packages.nix
View File

@ -14556,7 +14556,6 @@ in
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.revert-vfs-dont-open-real
];
};
@ -14564,7 +14563,7 @@ in
kernelPatches =
[ kernelPatches.bridge_stp_helper
kernelPatches.modinst_arg_list_too_long
kernelPatches.revert-vfs-dont-open-real
kernelPatches.raspberry_pi_wifi_fix
];
};