diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2020-10-29 01:15:05 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2020-10-30 09:40:12 -0700 |
| commit | e6db435973160591fe7348876a5567c729495175 (patch) | |
| tree | 14414ac75edc06b16cbc0132d63611c984496d12 | |
| parent | f89356b202fddf39ba323a1854041c5bdcc05602 (diff) | |
| download | nixpkgs-e6db435973160591fe7348876a5567c729495175.tar nixpkgs-e6db435973160591fe7348876a5567c729495175.tar.gz nixpkgs-e6db435973160591fe7348876a5567c729495175.tar.bz2 nixpkgs-e6db435973160591fe7348876a5567c729495175.tar.lz nixpkgs-e6db435973160591fe7348876a5567c729495175.tar.xz nixpkgs-e6db435973160591fe7348876a5567c729495175.tar.zst nixpkgs-e6db435973160591fe7348876a5567c729495175.zip | |
linux: add flavor metadata
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-libre.nix | 1 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-zen.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
4 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index cab11cc87ae..dd3050a93ee 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/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/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 7a831e61ae4..1e8514e9c2c 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -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/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 947aa7c19ab..f4b0f3870f2 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -7,6 +7,7 @@ in buildLinux (args // { modDirVersion = "${version}-zen1"; inherit version; + isZen = true; src = fetchFromGitHub { owner = "zen-kernel"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 319d24d2e25..d017efe6dfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18014,6 +18014,10 @@ in inherit kernel; inherit (kernel) stdenv; # in particular, use the same compiler by default + # to help determine module compatibility + inherit (kernel) isXen isZen isHardened isLibre; + inherit (kernel) kernelOlder kernelAtLeast; + # Obsolete aliases (these packages do not depend on the kernel). inherit (pkgs) odp-dpdk pktgen; # added 2018-05 @@ -18277,6 +18281,7 @@ in kernelPatches.hardened.${kernel.meta.branch} ]; modDirVersionArg = kernel.modDirVersion + "-hardened"; + isHardened = true; }); linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { }); |