Unverified Commit 34367859 authored by zowoq's avatar zowoq Committed by GitHub
Browse files

linux-rt: remove (#502889)

parents d5146e8b 85edc037

nixos/doc/manual/release-notes/rl-2605.section.md

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ 


- `services.tandoor-recipes` now uses a sub-directory for media files by default starting with `26.05`. Existing setups should move media files out of the data directory and adjust `services.tandoor-recipes.extraConfig.MEDIA_ROOT` accordingly. See [Migrating media files for pre 26.05 installations](#module-services-tandoor-recipes-migrating-media).



- `linux-rt` kernel has been removed due to a lack of maintenance.



- `rustic` was upgraded to `0.11.x`, which contains breaking [changes to command-line parameters and configuration file](https://rustic.cli.rs/docs/breaking_changes.html#0110).



- The packages `iw` and `wirelesstools` (`iwconfig`, `iwlist`, etc.) are no longer installed implicitly if wireless networking has been enabled.

nixos/tests/kernel-generic/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -80,10 +80,6 @@ let 
  kernels = patchedPkgs.linuxKernel.vanillaPackages // {

    inherit (patchedPkgs.linuxKernel.packages)

      linux_6_12_hardened

      linux_rt_5_10

      linux_rt_5_15

      linux_rt_6_1

      linux_rt_6_6



      linux_testing

      ;

pkgs/os-specific/linux/kernel/export-rt-sched-migrate.patch

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
Export linux-rt (PREEMPT_RT) specific symbols needed by ZFS.

(Regular kernel provides them static inline in linux/preempt.h.)



--- a/kernel/sched/core.c

+++ b/kernel/sched/core.c

@@ -1812 +1812 @@ void migrate_disable(void)

-EXPORT_SYMBOL_GPL(migrate_disable);

+EXPORT_SYMBOL(migrate_disable);

@@ -1843 +1843 @@ void migrate_enable(void)

-EXPORT_SYMBOL_GPL(migrate_enable);

+EXPORT_SYMBOL(migrate_enable);

pkgs/os-specific/linux/kernel/linux-rt-5.10.nix

deleted100644 → 0
+0 −62
Original line number Diff line number Diff line 
{

  lib,

  buildLinux,

  fetchurl,

  kernelPatches ? [ ],

  structuredExtraConfig ? { },

  extraMeta ? { },

  argsOverride ? { },

  ...

}@args:



let

  version = "5.10.245-rt139"; # updated by ./update-rt.sh

  branch = lib.versions.majorMinor version;

  kversion = builtins.elemAt (lib.splitString "-" version) 0;

in

buildLinux (

  args

  // {

    inherit version;

    pname = "linux-rt";



    # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ.

    modDirVersion = lib.versions.pad 3 version;



    src = fetchurl {

      url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

      hash = "sha256-Ex516xTab9aDs4grzYVghc/KR8waqJzS3rG0jSLSnZ8=";

    };



    kernelPatches =

      let

        rt-patch = {

          name = "rt";

          patch = fetchurl {

            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

            hash = "sha256-0/8We7wtj6Y3oMDdkLzmpuOz0kiY4RlWZeUcxy7UDds=";

          };

        };

      in

      [ rt-patch ] ++ kernelPatches;



    isLTS = true;

    structuredExtraConfig =

      with lib.kernel;

      {

        PREEMPT_RT = yes;

        # Fix error: unused option: PREEMPT_RT.

        EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)

        # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').

        PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.

        # Fix error: unused option: RT_GROUP_SCHED.

        RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.

      }

      // structuredExtraConfig;



    extraMeta = extraMeta // {

      inherit branch;

    };

  }

  // argsOverride

)

pkgs/os-specific/linux/kernel/linux-rt-5.15.nix

deleted100644 → 0
+0 −67
Original line number Diff line number Diff line 
{

  lib,

  buildLinux,

  fetchurl,

  kernelPatches ? [ ],

  structuredExtraConfig ? { },

  extraMeta ? { },

  argsOverride ? { },

  ...

}@args:



let

  version = "5.15.195-rt90"; # updated by ./update-rt.sh

  branch = lib.versions.majorMinor version;

  kversion = builtins.elemAt (lib.splitString "-" version) 0;

in

buildLinux (

  args

  // {

    inherit version;

    pname = "linux-rt";



    # modDirVersion needs a patch number, change X.Y-rtZ to X.Y.0-rtZ.

    modDirVersion =

      if (builtins.match "[^.]*[.][^.]*-.*" version) == null then

        version

      else

        lib.replaceStrings [ "-" ] [ ".0-" ] version;



    src = fetchurl {

      url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";

      hash = "sha256-I9CA3DL5nTk5w9G9ZaaO2FuPk0+SzBhBpj+Jjc25pEE=";

    };



    kernelPatches =

      let

        rt-patch = {

          name = "rt";

          patch = fetchurl {

            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";

            hash = "sha256-RdymUTnItL0Vi8Vt5j1lAlX/hxp6+Ka+oPBgD9agwZY=";

          };

        };

      in

      [ rt-patch ] ++ kernelPatches;



    structuredExtraConfig =

      with lib.kernel;

      {

        PREEMPT_RT = yes;

        # Fix error: unused option: PREEMPT_RT.

        EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)

        # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').

        PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.

        # Fix error: unused option: RT_GROUP_SCHED.

        RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.

      }

      // structuredExtraConfig;



    isLTS = true;



    extraMeta = extraMeta // {

      inherit branch;

    };

  }

  // argsOverride

)