Unverified Commit 789e6d97 authored by Bernardo Meurer's avatar Bernardo Meurer Committed by GitHub
Browse files

Merge pull request #182372 from fortuneteller2k/xanmod

xanmod-kernels: update and init tt
parents 77085e9b b3d53dee
Loading
Loading
Loading
Loading
+45 −46
Original line number Diff line number Diff line
{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:

let
  stableVariant = {
    version = "5.15.53";
    suffix = "xanmod1";
    hash = "sha256-mLgzaXG6QaJ0hfzfNlLbAEldxHK6iHuMVUv6p8zqRBo=";
  ltsVariant = {
    version = "5.15.54";
    hash = "sha256-0Odo+ZrQok3MMPl/512F8kIQ31mGZH6e9FyVVpXrYf0=";
  };

  edgeVariant = {
    version = "5.18.10";
    suffix = "xanmod1";
    hash = "sha256-RtvrJujd854bKf1YPiPavTh9oplpFN9ykr624K17vKE=";
    version = "5.18.11";
    hash = "sha256-UPLwaEWhBu1yriCUJu9L/B8yy+1zxnTQzHaKlT507UY=";
  };

  xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec {
  ttVariant = {
    version = "5.15.54";
    suffix = "xanmod1-tt";
    hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis=";
  };

  xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec {
    inherit version;
    modDirVersion = "${version}-${suffix}";

@@ -24,13 +28,7 @@ let
      inherit hash;
    };

    structuredExtraConfig =
      with lib.kernel;
      with (lib.kernel.whenHelpers version);
      {
        # TODO: remove this once https://github.com/NixOS/nixpkgs/pull/175433 is in master
        WERROR = no;

    structuredExtraConfig = with lib.kernel; {
      # removed options
      CFS_BANDWIDTH = lib.mkForce (option no);
      RT_GROUP_SCHED = lib.mkForce (option no);
@@ -79,6 +77,7 @@ let
  } // (args.argsOverride or { }));
in
{
  stable = xanmodKernelFor stableVariant;
  lts = xanmodKernelFor ltsVariant;
  edge = xanmodKernelFor edgeVariant;
  tt = xanmodKernelFor ttVariant;
}
+2 −0
Original line number Diff line number Diff line
@@ -23803,6 +23803,8 @@ with pkgs;
  linux_xanmod = linuxKernel.kernels.linux_xanmod;
  linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest;
  linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest;
  linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt;
  linux_xanmod_tt = linuxKernel.kernels.linux_xanmod_tt;
  linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { };
+7 −11
Original line number Diff line number Diff line
@@ -218,22 +218,17 @@ in {
      ];
    }).lqx;

    # This contains both the STABLE and EDGE variants of the XanMod kernel
    xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix;

    linux_xanmod = (xanmodKernels {
    # This contains the variants of the XanMod kernel
    xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix {
      kernelPatches = [
        kernelPatches.bridge_stp_helper
        kernelPatches.request_key_helper
      ];
    }).stable;
    };

    linux_xanmod_latest = (xanmodKernels {
      kernelPatches = [
        kernelPatches.bridge_stp_helper
        kernelPatches.request_key_helper
      ];
    }).edge;
    linux_xanmod = xanmodKernels.lts;
    linux_xanmod_latest = xanmodKernels.edge;
    linux_xanmod_tt = xanmodKernels.tt;

    linux_libre = deblobKernel packageAliases.linux_default.kernel;

@@ -564,6 +559,7 @@ in {
    linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
    linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod);
    linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest);
    linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt);

    hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14);