Unverified Commit 8b2946c9 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #327275 from K900/kernel-6.10 

linux_6_10: init at 6.10
parents a6f542b8 0c164142

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

+8 −4
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ 
        "hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19"

    },

    "6.1": {

        "version": "6.1.98",

        "hash": "sha256:01ilkykg65590f1gndhnp3s75wscqah6f4l9l1p5a03pgh9ckkcp"

        "version": "6.1.99",

        "hash": "sha256:1lsdwdx7i7xw1rzq88k3bz8sar77gb4rnmjx11pbmvmiwaffx1n0"

    },

    "5.15": {

        "version": "5.15.162",
@@ -24,8 +24,8 @@ 
        "hash": "sha256:109mk4zscm8611xs3bchnr94gasvw3vxsi6zhp3f2y132g670aq6"

    },

    "6.6": {

        "version": "6.6.39",

        "hash": "sha256:0svpgakk81082mhhq17r8nlbz36zavq23d71232rapq928hx90r7"

        "version": "6.6.40",

        "hash": "sha256:0f7mmw5pzd174376m7r928xbi9mdcla0vy6plq0xdf2mq01kqfjw"

    },

    "6.8": {

        "version": "6.8.12",
@@ -34,5 +34,9 @@ 
    "6.9": {

        "version": "6.9.9",

        "hash": "sha256:1f8y88rif3z5lp1bq00g66fd0xs1227qlqkxd2zs6fdjgr45pq1b"

    },

    "6.10": {

        "version": "6.10",

        "hash": "sha256:09p2z3z8c3aq6ipqdc58x6s52sy0cmyg6mj4f0g5yk755r19hikp"

    }

}

pkgs/os-specific/linux/kernel/linux-libre.nix

+2 −2
Original line number Diff line number Diff line 
{ stdenv, lib, fetchsvn, linux

, scripts ? fetchsvn {

    url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

    rev = "19597";

    sha256 = "0bxljx9dgz23ax2pjvx07sqks4s7al2qhn3zcjyxfqv69a0awa8w";

    rev = "19607";

    sha256 = "1kf1hm553g8sh7wyh0jw7nl2nmrzg74b62z1q17bznq5a7qf87pn";

  }

, ...

}:

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

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
, ... } @ args:



let

  version = "5.10.220-rt112"; # updated by ./update-rt.sh

  version = "5.10.221-rt113"; # updated by ./update-rt.sh

  branch = lib.versions.majorMinor version;

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

in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // { 


  src = fetchurl {

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

    sha256 = "16z1xqm7djm8pl15s5wvgc4pwq81gydcf00jpxfplw794kwszhvw";

    sha256 = "09975sby114mwfb8x2rlpaps6vb60dvs8f20cmb7hkxcxdzx87fs";

  };



  kernelPatches = let rt-patch = {

    name = "rt";

    patch = fetchurl {

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

      sha256 = "149m51kkzhx9fhqdf6k7chi38rm2iw3ld18qzh8afmq8dc1dcimq";

      sha256 = "1aaamfnlhzhi4lj1sk2m082fpgr3qxs3b3a1ikh8zwmy89kw9i9x";

    };

  }; in [ rt-patch ] ++ kernelPatches;

pkgs/os-specific/linux/kernel/perf/default.nix

+18 −0
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchurl

, fetchpatch

, kernel

, elfutils

, python3
@@ -60,6 +61,23 @@ stdenv.mkDerivation { 


  inherit (kernel) src;



  # Fix 6.10.0 holding pkg-config completely wrong.

  # Patches from perf-tools-next, should be in 6.11 or hopefully backported.

  patches = lib.optionals (lib.versionAtLeast kernel.version "6.10") [

    (fetchpatch {

      url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b";

      hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM=";

    })

    (fetchpatch {

      url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=366e17409f1f17ad872259ce4a4f8a92beb4c4ee";

      hash = "sha256-NZK1u40qvMwWcgkgJPGpEax2eMo9xHrCQxSYYOK0rbo=";

    })

    (fetchpatch {

      url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=1d302f626c2a23e4fd05bb810eff300e8f2174fd";

      hash = "sha256-KhCmof8LkyTcBBpfMEtolL3m3kmC5rukKzQvufVKCdI=";

    })

  ];



  postPatch = ''

    # Linux scripts

    patchShebangs scripts

pkgs/top-level/aliases.nix

+2 −0
Original line number Diff line number Diff line
@@ -769,6 +769,7 @@ mapAliases ({ 
  linuxPackages_6_7 = linuxKernel.packages.linux_6_7;

  linuxPackages_6_8 = linuxKernel.packages.linux_6_8;

  linuxPackages_6_9 = linuxKernel.packages.linux_6_9;

  linuxPackages_6_10 = linuxKernel.packages.linux_6_10;

  linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;

  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;

  linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
@@ -797,6 +798,7 @@ mapAliases ({ 
  linux_6_7 = linuxKernel.kernels.linux_6_7;

  linux_6_8 = linuxKernel.kernels.linux_6_8;

  linux_6_9 = linuxKernel.kernels.linux_6_9;

  linux_6_10 = linuxKernel.kernels.linux_6_10;

  linux_rpi0 = linuxKernel.kernels.linux_rpi1;

  linux_rpi02w = linuxKernel.kernels.linux_rpi3;

  linux_rpi1 = linuxKernel.kernels.linux_rpi1;