Added something like linux_2_6_23. Really -rc8. Rationale:
1. Not to forget all the systemKernel choices. 2. To learn new problems, so that adding actual 2.6.23 will be easily done. svn path=/nixpkgs/trunk/; revision=9381
This commit is contained in:
parent
2c2a03a2b8
commit
0274e5e95a
76
pkgs/os-specific/linux/kernel/linux-2.6.23.nix
Normal file
76
pkgs/os-specific/linux/kernel/linux-2.6.23.nix
Normal file
@ -0,0 +1,76 @@
|
||||
{ stdenv, fetchurl, perl, mktemp, module_init_tools
|
||||
|
||||
# A list of patches to apply to the kernel. Each element of this list
|
||||
# should be an attribute set {name, patch} where `name' is a
|
||||
# symbolic name and `patch' is the actual patch. The patch may
|
||||
# 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 ? ""
|
||||
|
||||
, # Your own kernel configuration file, if you don't want to use the
|
||||
# default.
|
||||
kernelConfig ? null
|
||||
}:
|
||||
|
||||
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
|
||||
|
||||
let
|
||||
|
||||
lib = import ../../../lib;
|
||||
|
||||
version = "2.6.22.9";
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = if userModeLinux then "user-mode-linux-${version}" else "linux-${version}";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2";
|
||||
sha256 = "19rspc22ld2xxdgik10c876m1lbxhcb1k3f31fg404dp21nxvkhq";
|
||||
};
|
||||
|
||||
patches = map (p: p.patch) kernelPatches;
|
||||
extraConfig = lib.concatStrings (map (p: "\n" + (if p ? extraConfig then p.extraConfig else "") + "\n") kernelPatches);
|
||||
|
||||
config =
|
||||
if kernelConfig != null then kernelConfig else
|
||||
if userModeLinux then ./config-2.6.22-uml else
|
||||
if stdenv.system == "i686-linux" then ./config-2.6.22-i686-smp else
|
||||
if stdenv.system == "x86_64-linux" then ./config-2.6.22-x86_64-smp else
|
||||
abort "No kernel configuration for your platform!";
|
||||
|
||||
buildInputs = [perl mktemp];
|
||||
|
||||
arch =
|
||||
if userModeLinux then "um" else
|
||||
if stdenv.system == "i686-linux" then "i386" else
|
||||
if stdenv.system == "x86_64-linux" then "x86_64" else
|
||||
abort "Platform ${stdenv.system} is not supported.";
|
||||
|
||||
makeFlags = if userModeLinux then "ARCH=um SHELL=bash" else "";
|
||||
|
||||
inherit module_init_tools;
|
||||
|
||||
allowLocalVersion = false; # don't allow patches to set a suffix
|
||||
inherit localVersion; # but do allow the user to set one.
|
||||
|
||||
meta = {
|
||||
description =
|
||||
(if userModeLinux then
|
||||
"User-Mode Linux"
|
||||
else
|
||||
"The Linux kernel") +
|
||||
(if kernelPatches == [] then "" else
|
||||
" (with patches: "
|
||||
+ lib.concatStrings (lib.intersperse ", " (map (x: x.name) kernelPatches))
|
||||
+ ")");
|
||||
};
|
||||
}
|
@ -2672,7 +2672,8 @@ rec {
|
||||
kernel = kernel_2_6_21;
|
||||
|
||||
systemKernel = (if (getConfig ["kernel" "version"] "2.6.21") == "2.6.22" then
|
||||
kernel_2_6_22 else kernel);
|
||||
kernel_2_6_22 else if (getConfig ["kernel" "version"] "2.6.21") == "2.6.23" then
|
||||
kernel_2_6_23 else kernel);
|
||||
|
||||
kernel_2_6_20 = import ../os-specific/linux/kernel/linux-2.6.20.nix {
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools;
|
||||
@ -2815,6 +2816,91 @@ rec {
|
||||
;
|
||||
};
|
||||
|
||||
kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix {
|
||||
inherit fetchurl stdenv perl mktemp module_init_tools;
|
||||
kernelPatches = [
|
||||
/*{ name = "ext3cow";
|
||||
patch = ../os-specific/linux/kernel/linux-2.6.20.3-ext3cow.patch;
|
||||
extraConfig =
|
||||
"CONFIG_EXT3COW_FS=m\n" +
|
||||
"CONFIG_EXT3COW_FS_XATTR=y\n" +
|
||||
"CONFIG_EXT3COW_FS_POSIX_ACL=y\n" +
|
||||
"CONFIG_EXT3COW_FS_SECURITY=y\n";
|
||||
}*/
|
||||
{ name = "paravirt-nvidia";
|
||||
patch = ../os-specific/linux/kernel/2.6.22-paravirt-nvidia.patch;
|
||||
}
|
||||
/*
|
||||
{ name = "skas-2.6.20-v9-pre9";
|
||||
patch = fetchurl {
|
||||
url = http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.20-v9-pre9/skas-2.6.20-v9-pre9.patch.bz2;
|
||||
md5 = "02e619e5b3aaf0f9768f03ac42753e74";
|
||||
};
|
||||
extraConfig =
|
||||
"CONFIG_PROC_MM=y\n" +
|
||||
"# CONFIG_PROC_MM_DUMPABLE is not set\n";
|
||||
}
|
||||
*/
|
||||
{ name = "fbsplash-0.9.2-r5-2.6.21";
|
||||
patch = fetchurl {
|
||||
url = http://dev.gentoo.org/~dsd/genpatches/trunk/2.6.22/4200_fbsplash-0.9.2-r5.patch;
|
||||
sha256 = "0822wwlf2dqsap5qslnnp0yl1nbvvvb76l73w2dd8zsyn0bqg3px";
|
||||
};
|
||||
extraConfig = "CONFIG_FB_SPLASH=y";
|
||||
}
|
||||
]++
|
||||
(if (getConfig ["kernel" "no_hz"] false) then [
|
||||
{
|
||||
name = "Enable-NO_HZ";
|
||||
patch = ../lib/empty.file;
|
||||
extraConfig = "CONFIG_NO_HZ=y\n";
|
||||
}
|
||||
] else [])
|
||||
++
|
||||
(if (getConfig ["kernel" "timer_stats"] false) then [
|
||||
{
|
||||
name = "Enable-TIMER_STATS";
|
||||
patch = ../lib/empty.file;
|
||||
extraConfig = "CONFIG_TIMER_STATS=y\n";
|
||||
}
|
||||
] else [])
|
||||
++
|
||||
(if (getConfig ["kernel" "usb_suspend"] false) then [
|
||||
{
|
||||
name = "Enable-USB_SUSPEND";
|
||||
patch = ../lib/empty.file;
|
||||
extraConfig = "CONFIG_USB_SUSPEND=y\n";
|
||||
}
|
||||
] else [])
|
||||
++
|
||||
(if (getConfig ["kernel" "no_irqbalance"] false) then [
|
||||
{
|
||||
name = "Disable-IRQBALANCE";
|
||||
patch = ../lib/empty.file;
|
||||
extraConfig = "# CONFIG_IRQBALANCE is not set\n";
|
||||
}
|
||||
] else [])
|
||||
++
|
||||
[{
|
||||
|
||||
name = "External-config";
|
||||
patch = ../lib/empty.file;
|
||||
extraConfig =( getConfig ["kernel" "addConfig"] "");
|
||||
}]
|
||||
++
|
||||
[{
|
||||
name = "patch-2.6.23-rc8";
|
||||
patch = fetchurl {
|
||||
url = http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.23-rc8.bz2;
|
||||
sha256 = "1007y8z9zs32fcm1m9ic8dp01jfj7550pr0l2sbhxlwr7v6cy554";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
||||
;
|
||||
};
|
||||
|
||||
|
||||
libselinux = import ../os-specific/linux/libselinux {
|
||||
inherit fetchurl stdenv libsepol;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user