From 6eea9ac8683a393f55d270490c91a6f0c2af4fc0 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 6 Jan 2019 19:26:08 +0100 Subject: [PATCH] linux: add feature flag to indicate support for 32bit emulation Motivated by the need to warn users trying to build configurations that depend on being able to run 32bit apps on 64bit kernels. --- pkgs/os-specific/linux/kernel/generic.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index e424dff596d..a731ec3388f 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -62,6 +62,7 @@ let netfilterRPFilter = true; grsecurity = false; xen_dom0 = false; + ia32Emulation = true; } // features) kernelPatches; intermediateNixConfig = import ./common-config.nix { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8d00a87c336..24fcbfda44b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14825,6 +14825,7 @@ in # Hardened linux hardenedLinuxPackagesFor = kernel: linuxPackagesFor (kernel.override { + features.ia32Emulation = false; extraConfig = import ../os-specific/linux/kernel/hardened-config.nix { inherit stdenv; inherit (kernel) version;