Commit a187f23b authored by K900's avatar K900
Browse files

linux_6_14: init at 6.14 

Also:
- enable cgroup_dmem on 6.14+
- enable devicetree explicitly (because whatever was pulling it in before doesn't now)
parent 69767345

pkgs/os-specific/linux/kernel/common-config.nix

+5 −0
Original line number Diff line number Diff line
@@ -868,6 +868,7 @@ let 
      CGROUP_HUGETLB = yes;

      CGROUP_PERF = yes;

      CGROUP_RDMA = yes;

      CGROUP_DMEM = whenAtLeast "6.14" yes;



      MEMCG = yes;

      MEMCG_SWAP = whenOlder "6.1" yes;
@@ -1095,6 +1096,10 @@ let 


        MD = yes; # Device mapper (RAID, LVM, etc.)



        # enable support for device trees and overlays

        OF = option yes;

        OF_OVERLAY = option yes;



        # Enable initrd support.

        BLK_DEV_INITRD = yes;

pkgs/os-specific/linux/kernel/kernels-org.json

+4 −0
Original line number Diff line number Diff line
@@ -30,5 +30,9 @@ 
    "6.13": {

        "version": "6.13.8",

        "hash": "sha256:1fqsfnam0ca2lyqgi9vh7x6xa24yjk6ym6z85bn6nrrxsxczm6i5"

    },

    "6.14": {

        "version": "6.14",

        "hash": "sha256:0w3nqh02vl8f2wsx3fmsvw1pdsnjs5zfqcmv2w2vnqdiwy1vd552"

    }

}

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ mapAliases { 
  linuxPackages_6_11 = linuxKernel.packages.linux_6_11;

  linuxPackages_6_12 = linuxKernel.packages.linux_6_12;

  linuxPackages_6_13 = linuxKernel.packages.linux_6_13;

  linuxPackages_6_14 = linuxKernel.packages.linux_6_14;

  linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;

  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;

  linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -879,6 +880,7 @@ mapAliases { 
  linux_6_11 = linuxKernel.kernels.linux_6_11;

  linux_6_12 = linuxKernel.kernels.linux_6_12;

  linux_6_13 = linuxKernel.kernels.linux_6_13;

  linux_6_14 = linuxKernel.kernels.linux_6_14;

  linux_rpi0 = linuxKernel.kernels.linux_rpi1;

  linux_rpi02w = linuxKernel.kernels.linux_rpi3;

  linux_rpi1 = linuxKernel.kernels.linux_rpi1;

pkgs/top-level/linux-kernels.nix

+10 −1
Original line number Diff line number Diff line
@@ -213,6 +213,14 @@ in { 
      ];

    };



    linux_6_14 = callPackage ../os-specific/linux/kernel/mainline.nix {

      branch = "6.14";

      kernelPatches = [

        kernelPatches.bridge_stp_helper

        kernelPatches.request_key_helper

      ];

    };



    linux_testing = let

      testing = callPackage ../os-specific/linux/kernel/mainline.nix {

        # A special branch that tracks the kernel under the release process
@@ -672,6 +680,7 @@ in { 
    linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);

    linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);

    linux_6_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);

    linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14);

  } // lib.optionalAttrs config.allowAliases {

    linux_4_14 = throw "linux 4.14 was removed because it will reach its end of life within 23.11"; # Added 2023-10-11

    linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
@@ -742,7 +751,7 @@ in { 
  packageAliases = {

    linux_default = packages.linux_6_12;

    # Update this when adding the newest kernel major version!

    linux_latest = packages.linux_6_13;

    linux_latest = packages.linux_6_14;

    linux_rt_default = packages.linux_rt_5_15;

    linux_rt_latest = packages.linux_rt_6_6;

  } // lib.optionalAttrs config.allowAliases {