aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json29
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix9
-rw-r--r--infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix18
17 files changed, 71 insertions, 70 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
index 8bd5d0212044..47e49dbe01d7 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
@@ -132,6 +132,7 @@ let
IP_MROUTE_MULTIPLE_TABLES = yes;
IP_MULTICAST = yes;
IP_MULTIPLE_TABLES = yes;
+ IPV6 = yes;
IPV6_ROUTER_PREF = yes;
IPV6_ROUTE_INFO = yes;
IPV6_OPTIMISTIC_DAD = yes;
@@ -774,6 +775,8 @@ let
X86_CHECK_BIOS_CORRUPTION = yes;
X86_MCE = yes;
+ RAS = yes; # Needed for EDAC support
+
# Our initrd init uses shebang scripts, so can't be modular.
BINFMT_SCRIPT = yes;
# For systemd-binfmt
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix
index cab11cc87ae2..dd3050a93eef 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix
@@ -45,6 +45,11 @@
stdenv.hostPlatform != stdenv.buildPlatform
, extraMeta ? {}
+, isXen ? features.xen_dom0 or false
+, isZen ? false
+, isLibre ? false
+, isHardened ? false
+
# easy overrides to stdenv.hostPlatform.platform members
, autoModules ? stdenv.hostPlatform.platform.kernelAutoModules
, preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false
@@ -175,7 +180,9 @@ let
passthru = {
features = kernelFeatures;
- inherit commonStructuredConfig;
+ inherit commonStructuredConfig isXen isZen isHardened isLibre;
+ kernelOlder = lib.versionOlder version;
+ kernelAtLeast = lib.versionAtLeast version;
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
};
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
index 036cc44ecea9..c07c65d9be3f 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -1,22 +1,27 @@
{
"4.14": {
- "name": "linux-hardened-4.14.201.a.patch",
- "sha256": "16jkhib0fc8l96a092srqpg850wh0n49pa0yghpviz29rlids6vs",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.201.a/linux-hardened-4.14.201.a.patch"
+ "name": "linux-hardened-4.14.208.a.patch",
+ "sha256": "09lmbfp6d4wpr2l7x1njq8q3sdiqz3rrjzkh6dqsdgwd9sdammb3",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.208.a/linux-hardened-4.14.208.a.patch"
},
"4.19": {
- "name": "linux-hardened-4.19.151.a.patch",
- "sha256": "12sh1zvc72p7kkbgpm4cjppv1vlqbywsqfsva76pjx1mw0wsj7sj",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.151.a/linux-hardened-4.19.151.a.patch"
+ "name": "linux-hardened-4.19.159.a.patch",
+ "sha256": "0ma4lf97l625474xha5pfb8kph2lm3892g6z63fwd5s1vmva6ni6",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.159.a/linux-hardened-4.19.159.a.patch"
},
"5.4": {
- "name": "linux-hardened-5.4.71.a.patch",
- "sha256": "1w4sfkx4qj9vx47z06bkf4biaiz58z2qp536g7dss26zdbx1im26",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.71.a/linux-hardened-5.4.71.a.patch"
+ "name": "linux-hardened-5.4.79.a.patch",
+ "sha256": "154i6ggj27qgsw562jcd93abcd54b4jllkr87h4k2ia6c0mfq4yb",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.79.a/linux-hardened-5.4.79.a.patch"
},
"5.8": {
- "name": "linux-hardened-5.8.15.a.patch",
- "sha256": "0b7bfzknz2am9pfypazqzky9bcd6659sakcdx2a7p1i3bj6zxnn1",
- "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.15.a/linux-hardened-5.8.15.a.patch"
+ "name": "linux-hardened-5.8.18.a.patch",
+ "sha256": "1r2n74nbyi3dp5zql9sk504xkpil6ylbyd99zqqva4nd3qg17c99",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch"
+ },
+ "5.9": {
+ "name": "linux-hardened-5.9.10.a.patch",
+ "sha256": "08gdr5sq156lap08nirw4gjq26vr8k65kbjh4js2ndrb0v49f2lk",
+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.10.a/linux-hardened-5.9.10.a.patch"
}
}
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
index dd0d2c2a627b..26694d965e73 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.14.201";
+ version = "4.14.210";
# 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;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0nr3w5m7dz28v7qfhp99ih4c369qrhq751wfikbz8ga3di0dqa72";
+ sha256 = "067xqi6sgf50p7s3n6y77cgf5bj5062s3bz3kqpp6f9wnk85267r";
};
} // (args.argsOverride or {}))
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
index d4e72cb3cbd2..15a5e1972a64 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "4.19.151";
+ version = "4.19.161";
# 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;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0vm3nsi9la3azxrsvndbd6fpz79pch7309f2144xyxszsk339cf7";
+ sha256 = "0h9wskmz9wridwnicnjlcmj1112qnlvqk01bhjkxv6b8jsajjh87";
};
} // (args.argsOverride or {}))
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 49591f634794..599d68636200 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.4.239";
+ version = "4.4.247";
extraMeta.branch = "4.4";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "03myd9ngmjmnddh4iqqsgcfg9rd11vyvwym38yh4m1p08j1zbg0k";
+ sha256 = "1jh7vmyx55krk6y2r9v48liifs5wwkgns3gp8rs5sm4klfm36r2a";
};
} // (args.argsOverride or {}))
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 114629bad577..9169506536a7 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
{ stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:
buildLinux (args // rec {
- version = "4.9.239";
+ version = "4.9.247";
extraMeta.branch = "4.9";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
- sha256 = "0lfbn5amykvwz1svvxayzhsz1dvm4mgzsnq1g0wqffclxm148hr3";
+ sha256 = "1mngdbsq8pdzd0x9hif4715cc7wzc3ahgp1yrknnqk598q0fnfpp";
};
} // (args.argsOverride or {}))
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
index 35025efb6572..8453ec0c6cb3 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.4.71";
+ version = "5.4.81";
# 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;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "1ivcimngj5h7lxslkrdljpfw9hfvdhrm8wrp7gp4d3gk7kpljw3k";
+ sha256 = "09w4bpr3v9rzcvxics5wddabplwbpk1mynl45lh9csbjfpjbsw4l";
};
} // (args.argsOverride or {}))
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix
index 3e13d9eb9ce2..dd11359dbf41 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.8.15";
+ version = "5.8.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;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "0hfnq4n902pws8sjxd1lsdxxa0v45g988imp73xnqfqv2d71r0bj";
+ sha256 = "0d2mm16mjyl2d734ak0lj8vd76h3r0san7l7g2zczd5pjkva7d2a";
};
} // (args.argsOverride or {}))
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix
index a7aefa209cc9..e71044b0d968 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix
@@ -3,7 +3,7 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.9";
+ version = "5.9.12";
# 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;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
- sha256 = "01hsddf4sf9q5l1innyyl34b51y48v5wi34qpr421gsh2bpa8f9j";
+ sha256 = "1gfrn3sz3h4cbsf3r8f9jxja400qsmbrk8sclk4cjx1l5qcmczyr";
};
} // (args.argsOverride or {}))
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index ba37c71d1345..a272bd286f32 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
+{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args:
buildLinux (args // rec {
version = "4.14.165-172";
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
index 4e308d657ac4..f0d362b02ce0 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix
@@ -1,8 +1,8 @@
{ stdenv, lib, fetchsvn, linux
, scripts ? fetchsvn {
url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
- rev = "17724";
- sha256 = "0aqg8il35a1mda4icqprvriham81vvnsa04rjc86b6x7khxdhiq2";
+ rev = "17768";
+ sha256 = "0j85bjxylvl88xzf3nji1xadz3ws1kfbyhbn47haipigncvccndj";
}
, ...
}:
@@ -17,6 +17,7 @@ let
in linux.override {
argsOverride = {
modDirVersion = "${linux.modDirVersion}-gnu";
+ isLibre = true;
src = stdenv.mkDerivation {
name = "${linux.name}-libre-src";
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
deleted file mode 100644
index e53c3ceb5c46..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-mptcp-94.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, structuredExtraConfig ? {}, ... } @ args:
-let
- mptcpVersion = "0.94.6";
- modDirVersion = "4.14.127";
-in
-buildLinux ({
- version = "${modDirVersion}-mptcp_v${mptcpVersion}";
- inherit modDirVersion;
-
- extraMeta = {
- branch = "4.4";
- maintainers = with stdenv.lib.maintainers; [ teto layus ];
- };
-
- src = fetchFromGitHub {
- owner = "multipath-tcp";
- repo = "mptcp";
- rev = "v${mptcpVersion}";
- sha256 = "071cx9205wpzhi5gc2da79w2abs3czd60jg0xml7j1szc5wl4yfn";
- };
-
- structuredExtraConfig = stdenv.lib.mkMerge [
- (import ./mptcp-config.nix { inherit stdenv; })
- structuredExtraConfig
- ];
-} // args)
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
index b1f40ac1c96c..3bb3ac7de27a 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
@@ -6,7 +6,7 @@
, ... } @ args:
let
- version = "5.4.70-rt40"; # updated by ./update-rt.sh
+ version = "5.4.78-rt44"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in buildLinux (args // {
@@ -14,14 +14,14 @@ in buildLinux (args // {
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
- sha256 = "01shqhibrxirl9bik8jwiag70n9n0l7782xh73gkb8jvbh4dicy0";
+ sha256 = "0z8skj0w9jfrz9pfxaqfzqh82l13bz5lhza2wjsxk02cyhhnm226";
};
kernelPatches = let rt-patch = {
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
- sha256 = "19px04cmv1v65ad7dr3y0bjr9xviawhb26iijvnxiwyjvm0054kw";
+ sha256 = "0cvvk647cz7nckhyxrsvdnsc6hzhy09y3c1155xzhydiv5gxc56h";
};
}; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches;
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix
index b056568b1663..5bf74ffd377b 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -3,15 +3,15 @@
with stdenv.lib;
buildLinux (args // rec {
- version = "5.9-rc8";
- extraMeta.branch = "5.9";
+ version = "5.10-rc6";
+ extraMeta.branch = "5.10";
# modDirVersion needs to be x.y.z, will always add .0
modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg;
src = fetchurl {
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
- sha256 = "0yhjanmrg0cjmdn7yq8nx0h7q3aq9cimqhn9k4nis1a976p8wpgw";
+ sha256 = "14ykzs98r918sqv7lddlps4r7hza1zgw0x67mmj77cmqiv6d8ffi";
};
# Should the testing kernels ever be built on Hydra?
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
index 947aa7c19ab3..c4f08e568a03 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix
@@ -1,23 +1,24 @@
{ stdenv, fetchFromGitHub, buildLinux, ... } @ args:
let
- version = "5.8.13";
+ version = "5.9.12";
in
buildLinux (args // {
modDirVersion = "${version}-zen1";
inherit version;
+ isZen = true;
src = fetchFromGitHub {
owner = "zen-kernel";
repo = "zen-kernel";
rev = "v${version}-zen1";
- sha256 = "161bvrmic7gspkgkv0pqssk6dzv95vkxld69rir968khwlnpsnim";
+ sha256 = "07cmcw8ib9wc4im08pbmxhj187lhsfxh2asn4jdxadxxq3f60h6w";
};
extraMeta = {
- branch = "5.8/master";
- maintainers = with stdenv.lib.maintainers; [ atemu ];
+ branch = "5.9/master";
+ maintainers = with stdenv.lib.maintainers; [ atemu andresilva ];
};
} // (args.argsOverride or {}))
diff --git a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
index 92dc334135ad..3bdb8c4f2973 100644
--- a/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/infra/libkookie/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -34,6 +34,13 @@ in {
randstructSeed ? "",
# Use defaultMeta // extraMeta
extraMeta ? {},
+
+ # for module compatibility
+ isXen ? features.xen_dom0 or false,
+ isZen ? false,
+ isLibre ? false,
+ isHardened ? false,
+
# Whether to utilize the controversial import-from-derivation feature to parse the config
allowImportFromDerivation ? false,
# ignored
@@ -86,6 +93,9 @@ let
passthru = {
inherit version modDirVersion config kernelPatches configfile
moduleBuildDependencies stdenv;
+ inherit isXen isZen isHardened isLibre;
+ kernelOlder = stdenv.lib.versionOlder version;
+ kernelAtLeast = stdenv.lib.versionAtLeast version;
};
inherit src;
@@ -233,10 +243,10 @@ let
rm -fR drivers
# Keep all headers
- find . -type f -name '*.h' -print0 | xargs -0 chmod u-w
+ find . -type f -name '*.h' -print0 | xargs -0 -r chmod u-w
# Keep linker scripts (they are required for out-of-tree modules on aarch64)
- find . -type f -name '*.lds' -print0 | xargs -0 chmod u-w
+ find . -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w
# Keep root and arch-specific Makefiles
chmod u-w Makefile
@@ -246,7 +256,7 @@ let
chmod u-w -R scripts
# Delete everything not kept
- find . -type f -perm -u=w -print0 | xargs -0 rm
+ find . -type f -perm -u=w -print0 | xargs -0 -r rm
# Delete empty directories
find -empty -type d -delete
@@ -292,7 +302,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches
nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ]
++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools
++ optional (stdenv.lib.versionAtLeast version "4.14" && stdenv.lib.versionOlder version "5.8") libelf
- # Removed utillinuxMinimal since it should not be a dependency.
+ # Removed util-linuxMinimal since it should not be a dependency.
++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ]
++ optional (stdenv.lib.versionAtLeast version "5.2") cpio
++ optional (stdenv.lib.versionAtLeast version "5.8") elfutils