Merge pull request #235027 from Kiskae/5_4_hardened_unbreak
linuxPackages_5_4_hardened.kernel: fix broken KConfig
This commit is contained in:
commit
c66b67fde8
|
@ -41,7 +41,7 @@ assert (versionAtLeast version "4.9");
|
|||
DEBUG_SG = yes;
|
||||
SCHED_STACK_END_CHECK = yes;
|
||||
|
||||
REFCOUNT_FULL = whenOlder "5.5" yes;
|
||||
REFCOUNT_FULL = whenOlder "5.4.208" yes;
|
||||
|
||||
# Randomize page allocator when page_alloc.shuffle=1
|
||||
SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes;
|
||||
|
|
|
@ -46,10 +46,7 @@ let
|
|||
inherit sha256;
|
||||
};
|
||||
extraMeta = {
|
||||
broken =
|
||||
kernel.meta.broken ||
|
||||
lib.versions.majorMinor version == "4.14" ||
|
||||
(stdenv.isx86_64 && lib.versionAtLeast version "4.19" && lib.versionOlder version "5.5");
|
||||
broken = kernel.meta.broken;
|
||||
};
|
||||
};
|
||||
kernelPatches = kernel.kernelPatches ++ [
|
||||
|
@ -256,9 +253,18 @@ in {
|
|||
|
||||
linux_hardened = hardenedKernelFor packageAliases.linux_default.kernel { };
|
||||
|
||||
linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 { };
|
||||
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 { };
|
||||
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 { };
|
||||
linux_4_14_hardened = hardenedKernelFor kernels.linux_4_14 {
|
||||
stdenv = gcc10Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
|
||||
};
|
||||
linux_4_19_hardened = hardenedKernelFor kernels.linux_4_19 {
|
||||
stdenv = gcc10Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
|
||||
};
|
||||
linux_5_4_hardened = hardenedKernelFor kernels.linux_5_4 {
|
||||
stdenv = gcc10Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
|
||||
};
|
||||
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
|
||||
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
|
||||
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
|
||||
|
@ -600,23 +606,14 @@ in {
|
|||
linux_testing = packagesFor kernels.linux_testing;
|
||||
linux_testing_bcachefs = recurseIntoAttrs (packagesFor kernels.linux_testing_bcachefs);
|
||||
|
||||
linux_hardened = recurseIntoAttrs (hardenedPackagesFor packageAliases.linux_default.kernel { });
|
||||
linux_hardened = recurseIntoAttrs (packagesFor kernels.linux_hardened);
|
||||
|
||||
linux_4_14_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_14 {
|
||||
stdenv = gcc10Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
|
||||
});
|
||||
linux_4_19_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_4_19 {
|
||||
stdenv = gcc10Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
|
||||
});
|
||||
linux_5_4_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_4 {
|
||||
stdenv = gcc10Stdenv;
|
||||
buildPackages = buildPackages // { stdenv = buildPackages.gcc10Stdenv; };
|
||||
});
|
||||
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
|
||||
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
|
||||
linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { });
|
||||
linux_4_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_14_hardened);
|
||||
linux_4_19_hardened = recurseIntoAttrs (packagesFor kernels.linux_4_19_hardened);
|
||||
linux_5_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_4_hardened);
|
||||
linux_5_10_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_10_hardened);
|
||||
linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened);
|
||||
linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
|
||||
|
||||
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
|
||||
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
|
||||
|
|
Loading…
Reference in a new issue