ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Remove User Mode Linux

Browse Source 
It hasn't built in a long time and it's obsolete IMHO.
This commit is contained in:
Eelco Dolstra 2012-09-21 13:32:37 -04:00
parent 7057acb322
commit 0874615fcc
11 changed files with 9 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/os-specific/linux/kernel/generic.nix
View File

@ -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))

2
pkgs/os-specific/linux/kernel/linux-3.0.nix
View File

@ -1,4 +1,4 @@
args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:

2
pkgs/os-specific/linux/kernel/linux-3.1.nix
View File

@ -1,4 +1,4 @@
args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:

2
pkgs/os-specific/linux/kernel/linux-3.2.nix
View File

@ -1,4 +1,4 @@
args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:

2
pkgs/os-specific/linux/kernel/linux-3.3.nix
View File

@ -1,4 +1,4 @@
args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:

2
pkgs/os-specific/linux/kernel/linux-3.4.nix
View File

@ -1,4 +1,4 @@
args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:

2
pkgs/os-specific/linux/kernel/linux-3.5.nix
View File

@ -1,4 +1,4 @@
args @ { stdenv, fetchurl, userModeLinux ? false, extraConfig ? ""
args @ { stdenv, fetchurl, extraConfig ? ""
, perl, mktemp, module_init_tools
, ... }:

17
pkgs/os-specific/linux/uml-utilities/builder.sh
View File

@ -1,17 +0,0 @@
buildinputs=""
source $stdenv/setup
tar xvfj $src
cd tools
[ -n "$tunctl" ] && sed -e '1s/.*/TUNCTL = tunctl/' -i Makefile
[ -z "$mconsole" ] && sed -e 's/mconsole//' -i Makefile
mkdir $out
mkdir $out/bin
mkdir $out/lib
mkdir $out/lib/uml
make BIN_DIR=$out/bin LIB_DIR=$out/lib/uml
make BIN_DIR=$out/bin LIB_DIR=$out/lib/uml install
ln -s $out/lib/uml/port-helper $out/bin/port-helper
[ -z "$tunctl" ] || [ -f $out/bin/tunctl ] || fail_no_tunctl
[ -z "$mconsole" ] || [ -f $out/bin/uml_mconsole ] || fail_no_mconsole

13
pkgs/os-specific/linux/uml-utilities/default.nix
View File

@ -1,13 +0,0 @@
{lib, stdenv, fetchurl, linuxHeaders , readline, tunctl ? false, mconsole ? false}:
stdenv.mkDerivation {
inherit tunctl mconsole;
buildInputs = lib.optional tunctl linuxHeaders
++ lib.optional mconsole readline;
name = "uml-utilities-20040114";
builder = ./builder.sh;
src = fetchurl {
url = http://nixos.org/tarballs/uml_utilities_20040114.tar.bz2;
md5 = "1fd5b791ef32c6a3ed4ae42c4a53a316";
};
}

8
pkgs/top-level/all-packages.nix
View File

@ -6189,14 +6189,6 @@ let
udisks = callPackage ../os-specific/linux/udisks { };
uml = linux.override {
userModeLinux = true;
};
umlutilities = callPackage ../os-specific/linux/uml-utilities {
tunctl = true; mconsole = true;
};
untie = callPackage ../os-specific/linux/untie { };
upower = callPackage ../os-specific/linux/upower { };

1
pkgs/top-level/release.nix
View File

@ -299,7 +299,6 @@ with (import ./release-lib.nix);
tinycc = ["i686-linux"];
uae = linux;
udev = linux;
uml = ["i686-linux"];
unrar = linux;
upstart = linux;
usbutils = linux;