linux: add flavor metadata
This commit is contained in:
committed by
Jonathan Ringer
parent
f89356b202
commit
e6db435973
@@ -45,6 +45,11 @@
|
|||||||
stdenv.hostPlatform != stdenv.buildPlatform
|
stdenv.hostPlatform != stdenv.buildPlatform
|
||||||
, extraMeta ? {}
|
, extraMeta ? {}
|
||||||
|
|
||||||
|
, isXen ? features.xen_dom0 or false
|
||||||
|
, isZen ? false
|
||||||
|
, isLibre ? false
|
||||||
|
, isHardened ? false
|
||||||
|
|
||||||
# easy overrides to stdenv.hostPlatform.platform members
|
# easy overrides to stdenv.hostPlatform.platform members
|
||||||
, autoModules ? stdenv.hostPlatform.platform.kernelAutoModules
|
, autoModules ? stdenv.hostPlatform.platform.kernelAutoModules
|
||||||
, preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false
|
, preferBuiltin ? stdenv.hostPlatform.platform.kernelPreferBuiltin or false
|
||||||
@@ -175,7 +180,9 @@ let
|
|||||||
|
|
||||||
passthru = {
|
passthru = {
|
||||||
features = kernelFeatures;
|
features = kernelFeatures;
|
||||||
inherit commonStructuredConfig;
|
inherit commonStructuredConfig isXen isZen isHardened isLibre;
|
||||||
|
kernelOlder = lib.versionOlder version;
|
||||||
|
kernelAtLeast = lib.versionAtLeast version;
|
||||||
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
|
passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ let
|
|||||||
in linux.override {
|
in linux.override {
|
||||||
argsOverride = {
|
argsOverride = {
|
||||||
modDirVersion = "${linux.modDirVersion}-gnu";
|
modDirVersion = "${linux.modDirVersion}-gnu";
|
||||||
|
isLibre = true;
|
||||||
|
|
||||||
src = stdenv.mkDerivation {
|
src = stdenv.mkDerivation {
|
||||||
name = "${linux.name}-libre-src";
|
name = "${linux.name}-libre-src";
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ in
|
|||||||
buildLinux (args // {
|
buildLinux (args // {
|
||||||
modDirVersion = "${version}-zen1";
|
modDirVersion = "${version}-zen1";
|
||||||
inherit version;
|
inherit version;
|
||||||
|
isZen = true;
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "zen-kernel";
|
owner = "zen-kernel";
|
||||||
|
|||||||
@@ -18014,6 +18014,10 @@ in
|
|||||||
inherit kernel;
|
inherit kernel;
|
||||||
inherit (kernel) stdenv; # in particular, use the same compiler by default
|
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).
|
# Obsolete aliases (these packages do not depend on the kernel).
|
||||||
inherit (pkgs) odp-dpdk pktgen; # added 2018-05
|
inherit (pkgs) odp-dpdk pktgen; # added 2018-05
|
||||||
|
|
||||||
@@ -18277,6 +18281,7 @@ in
|
|||||||
kernelPatches.hardened.${kernel.meta.branch}
|
kernelPatches.hardened.${kernel.meta.branch}
|
||||||
];
|
];
|
||||||
modDirVersionArg = kernel.modDirVersion + "-hardened";
|
modDirVersionArg = kernel.modDirVersion + "-hardened";
|
||||||
|
isHardened = true;
|
||||||
});
|
});
|
||||||
|
|
||||||
linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { });
|
linuxPackages_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { });
|
||||||
|
|||||||
Reference in New Issue
Block a user