diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-21 13:32:37 -0400 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-21 13:32:37 -0400 |
commit | 0874615fcce838176a1626a35498258baccdfd9d (patch) | |
tree | ef8da520dea6bce87a9ed5374f0c2bda9f1693ed /pkgs/os-specific/linux/kernel/generic.nix | |
parent | 7057acb3226980e8556b9c69a25acee60af74442 (diff) | |
download | nixlib-0874615fcce838176a1626a35498258baccdfd9d.tar nixlib-0874615fcce838176a1626a35498258baccdfd9d.tar.gz nixlib-0874615fcce838176a1626a35498258baccdfd9d.tar.bz2 nixlib-0874615fcce838176a1626a35498258baccdfd9d.tar.lz nixlib-0874615fcce838176a1626a35498258baccdfd9d.tar.xz nixlib-0874615fcce838176a1626a35498258baccdfd9d.tar.zst nixlib-0874615fcce838176a1626a35498258baccdfd9d.zip |
Remove User Mode Linux
It hasn't built in a long time and it's obsolete IMHO.
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generic.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generic.nix | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 9e8ee74acb17..48f050f98cc2 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -27,9 +27,6 @@ # optionally be compressed with gzip or bzip2. kernelPatches ? [] -, # Whether to build a User-Mode Linux kernel. - userModeLinux ? false - , # Allows you to set your own kernel version suffix (e.g., # "-my-kernel"). localVersion ? "" @@ -63,7 +60,7 @@ let in stdenv.mkDerivation { - name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}"; + name = "linux-${version}"; enableParallelBuilding = true; @@ -84,7 +81,7 @@ stdenv.mkDerivation { kernelConfig = kernelConfigFun config; # For UML and non-PC, just ignore all options that don't apply (We are lazy). - ignoreConfigErrors = (userModeLinux || stdenv.platform.name != "pc"); + ignoreConfigErrors = stdenv.platform.name != "pc"; buildNativeInputs = [ perl mktemp ]; buildInputs = lib.optional (stdenv.platform.uboot != null) @@ -98,7 +95,6 @@ stdenv.mkDerivation { # Should we trust platform.kernelArch? We can only do # that once we differentiate i686/x86_64 in platforms. arch = - if userModeLinux then "um" else if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.isArm then "arm" else @@ -129,10 +125,7 @@ stdenv.mkDerivation { meta = { description = - (if userModeLinux then - "User-Mode Linux" - else - "The Linux kernel") + + "The Linux kernel" + (if kernelPatches == [] then "" else " (with patches: " + lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches)) |