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

Merge pull request #174091 from alyssais/linux-5.18

Browse Source
This commit is contained in:
Sandro 2022-05-25 22:55:58 +02:00 committed by GitHub
commit 882fc91780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -38,8 +38,9 @@ let
# Necessary for BTF # Necessary for BTF
DEBUG_INFO = mkMerge [ DEBUG_INFO = mkMerge [
(whenOlder "5.2" (if (features.debug or false) then yes else no)) (whenOlder "5.2" (if (features.debug or false) then yes else no))
(whenAtLeast "5.2" yes) (whenBetween "5.2" "5.18" yes)
]; ];
DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes;
DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes);
BPF_LSM = whenAtLeast "5.7" (option yes); BPF_LSM = whenAtLeast "5.7" (option yes);
DEBUG_KERNEL = yes; DEBUG_KERNEL = yes;
@ -407,7 +408,7 @@ let
UDF_FS = module; UDF_FS = module;
NFSD_V2_ACL = yes; NFSD_V2_ACL = yes;
NFSD_V3 = yes; NFSD_V3 = whenOlder "5.18" yes;
NFSD_V3_ACL = yes; NFSD_V3_ACL = yes;
NFSD_V4 = yes; NFSD_V4 = yes;
NFSD_V4_SECURITY_LABEL = yes; NFSD_V4_SECURITY_LABEL = yes;

18
pkgs/os-specific/linux/kernel/linux-5.18.nix Normal file
View File

@ -0,0 +1,18 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.18";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "1vjwhl4s8qxfg1aabn8xnpjza3qzrjcp5450h9qpjvl999lg3wsi";
};
} // (args.argsOverride or { }))

2
pkgs/top-level/aliases.nix
View File

@ -732,6 +732,7 @@ mapAliases ({
linuxPackages_5_15 = linuxKernel.packages.linux_5_15; linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
linuxPackages_5_16 = linuxKernel.packages.linux_5_16; linuxPackages_5_16 = linuxKernel.packages.linux_5_16;
linuxPackages_5_17 = linuxKernel.packages.linux_5_17; linuxPackages_5_17 = linuxKernel.packages.linux_5_17;
linuxPackages_5_18 = linuxKernel.packages.linux_5_18;
linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14;
linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
@ -750,6 +751,7 @@ mapAliases ({
linux_5_15 = linuxKernel.kernels.linux_5_15; linux_5_15 = linuxKernel.kernels.linux_5_15;
linux_5_16 = linuxKernel.kernels.linux_5_16; linux_5_16 = linuxKernel.kernels.linux_5_16;
linux_5_17 = linuxKernel.kernels.linux_5_17; linux_5_17 = linuxKernel.kernels.linux_5_17;
linux_5_18 = linuxKernel.kernels.linux_5_18;
linux_5_4 = linuxKernel.kernels.linux_5_4; linux_5_4 = linuxKernel.kernels.linux_5_4;
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
linux_rpi0 = linuxKernel.kernels.linux_rpi1; linux_rpi0 = linuxKernel.kernels.linux_rpi1;

10
pkgs/top-level/linux-kernels.nix
View File

@ -169,6 +169,13 @@ in {
]; ];
}; };
linux_5_18 = callPackage ../os-specific/linux/kernel/linux-5.18.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_testing = let linux_testing = let
testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
kernelPatches = [ kernelPatches = [
@ -502,6 +509,7 @@ in {
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15); linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
linux_5_17 = recurseIntoAttrs (packagesFor kernels.linux_5_17); linux_5_17 = recurseIntoAttrs (packagesFor kernels.linux_5_17);
linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18);
}; };
rtPackages = { rtPackages = {
@ -557,7 +565,7 @@ in {
packageAliases = { packageAliases = {
linux_default = if stdenv.hostPlatform.isi686 then packages.linux_5_10 else packages.linux_5_15; linux_default = if stdenv.hostPlatform.isi686 then packages.linux_5_10 else packages.linux_5_15;
# Update this when adding the newest kernel major version! # Update this when adding the newest kernel major version!
linux_latest = packages.linux_5_17; linux_latest = packages.linux_5_18;
linux_mptcp = packages.linux_mptcp_95; linux_mptcp = packages.linux_mptcp_95;
linux_rt_default = packages.linux_rt_5_4; linux_rt_default = packages.linux_rt_5_4;
linux_rt_latest = packages.linux_rt_5_10; linux_rt_latest = packages.linux_rt_5_10;