linux_testing: 5.13-rc6 -> 5.15-rc6

conduit-nginx
arcnmx 2021-10-21 12:27:44 -07:00
parent 3ef1d2a960
commit 146c830cff
2 changed files with 4 additions and 4 deletions

View File

@ -410,7 +410,7 @@ let
CIFS_POSIX = option yes; CIFS_POSIX = option yes;
CIFS_FSCACHE = yes; CIFS_FSCACHE = yes;
CIFS_STATS = whenOlder "4.19" yes; CIFS_STATS = whenOlder "4.19" yes;
CIFS_WEAK_PW_HASH = yes; CIFS_WEAK_PW_HASH = whenOlder "5.15" yes;
CIFS_UPCALL = yes; CIFS_UPCALL = yes;
CIFS_ACL = whenOlder "5.3" yes; CIFS_ACL = whenOlder "5.3" yes;
CIFS_DFS_UPCALL = yes; CIFS_DFS_UPCALL = yes;

View File

@ -3,15 +3,15 @@
with lib; with lib;
buildLinux (args // rec { buildLinux (args // rec {
version = "5.13-rc6"; version = "5.15-rc6";
extraMeta.branch = "5.12"; extraMeta.branch = lib.versions.majorMinor version;
# modDirVersion needs to be x.y.z, will always add .0 # modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
src = fetchurl { src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
sha256 = "sha256-PunFd6tOsmrsPItp2QX4TEVxHnvvi1BMSwWio/DTlMU="; sha256 = "1lp3jqwsbd97k3bx4crs8rc2wssyaf0v8x4kl4zv7g7ww2kkg2ii";
}; };
# Should the testing kernels ever be built on Hydra? # Should the testing kernels ever be built on Hydra?