Update Zen Kernel

svn path=/nixpkgs/trunk/; revision=18174
This commit is contained in:
Michael Raskin 2009-11-05 23:32:48 +00:00
parent 0e608788c0
commit dca59abcca
5 changed files with 128 additions and 8 deletions

View File

@ -0,0 +1,102 @@
a :
let
s = import ./src-for-2.6.31-zen5.nix;
in
(import ../kernel/generic.nix) (rec {
inherit (a) stdenv fetchurl perl mktemp module_init_tools;
src = a.builderDefs.fetchGitFromSrcInfo s;
version = "2.6.31-zen5";
config = "./kernel-config";
features = {
iwlwifi = true;
zen = true;
fbConDecor = true;
aufs = true;
};
extraMeta = {
maintainers = [
a.lib.maintainers.raskin
];
platforms = with a.lib.platforms;
linux;
};
preConfigure = ''
killOption () {
sed -re 's/^('"$1"')=.*/# \1 is not set/' -i .config
}
setOptionVal () {
sed -re 's/^('"$1"')=.*/\1='"$2"'/' -i .config
sed -re 's/^# ('"$1"') is not set/\1='"$2"'/' -i .config
sed -re "1i$1=$2" -i .config
}
setOptionMod () {
setOptionVal "$1" m
}
setOptionYes () {
setOptionVal "$1" y
}
make allmodconfig
killOption CONFIG_CMDLINE_OVERRIDE
killOption 'CONFIG_.*_DEBUG.*'
killOption 'CONFIG_DEBUG.*'
killOption CONFIG_AUDIT_ARCH
killOption CONFIG_PERF_COUNTERS
killOption 'CONFIG_GCOV.*'
killOption 'CONFIG_KGDB.*'
killOption 'CONFIG_.*_TEST'
killOption CONFIG_TASKSTATS
killOption CONFIG_SLQB
killOption CONFIG_SLQB_ALLOCATOR
setOptionYes CONFIG_SLUB_ALLOCATOR
setOptionYes CONFIG_SLUB
killOption CONFIG_ACPI_CUSTOM_DSDT_INITRD
killOption CONFIG_DEVTMPFS
killOption CONFIG_DEVTMPFS_MOUNT
killOption CONFIG_IMA
'' +
''
killOption CONFIG_USB_OTG_BLACKLIST_HUB
''+
''
killOption CONFIG_KERNEL_BZIP2
killOption CONFIG_KERNEL_LZMA
setOptionYes CONFIG_KERNEL_GZIP
''+
''
killOption CONFIG_FB_TILEBLITTING
killOption CONFIG_FB_S3
killOption CONFIG_FB_VT8623
killOption CONFIG_FB_ARK
setOptionYes CONFIG_FRAMEBUFFER_CONSOLE
setOptionYes CONFIG_FB
make oldconfig
setOptionYes CONFIG_FB_CON_DECOR
setOptionYes CONFIG_FB_VESA
''+
''
killOption CONFIG_PREEMPT_NONE
setOptionYes CONFIG_PREEMPT_VOLUNTARY
''+
''
killOption CONFIG_PRAMFS
''+
(if a.lib.attrByPath ["ckSched"] false a then ''
killOption CONFIG_CPU_CFS
setOptionYes CONFIG_CPU_BFS
killOption CONFIG_NO_HZ
killOption CONFIG_HZ_1000
setOptionYes CONFIG_HZ_250
setOptionVal CONFIG_HZ 250
''else "") +
''
cp .config ${config}
'';
})

View File

@ -0,0 +1,9 @@
rec {
version="cd9caea74b8f90e8dded45a93a173f0f5c5aef25";
name="zen-linux-cd9caea74b8f90e8dded45a93a173f0f5c5aef25";
hash="86e254d1aab17a66d7f5a83d93430b11dbeb95be1ee06f1d6a4c36219e4dfaf4";
rev="cd9caea74b8f90e8dded45a93a173f0f5c5aef25";
url="git://zen-kernel.org/kernel/zen-stable.git";
}

View File

@ -1,8 +1,8 @@
rec {
version="cd9caea74b8f90e8dded45a93a173f0f5c5aef25";
name="zen-linux-cd9caea74b8f90e8dded45a93a173f0f5c5aef25";
hash="86e254d1aab17a66d7f5a83d93430b11dbeb95be1ee06f1d6a4c36219e4dfaf4";
rev="cd9caea74b8f90e8dded45a93a173f0f5c5aef25";
version="66a44aa93959818bdb8153fea27b0992197ebc54";
name="zen-linux-66a44aa93959818bdb8153fea27b0992197ebc54";
hash="f5c86214424c8a7202c2dd9bbbd800561940af00800edb8afab080a73c185bca";
rev="66a44aa93959818bdb8153fea27b0992197ebc54";
url="git://zen-kernel.org/kernel/zen-stable.git";

View File

@ -6,7 +6,7 @@ in
inherit (a) stdenv fetchurl perl mktemp module_init_tools;
src = a.builderDefs.fetchGitFromSrcInfo s;
version = "2.6.31-zen5";
version = "2.6.31-zen7";
config = "./kernel-config";
features = {
iwlwifi = true;

View File

@ -5537,7 +5537,7 @@ let
kernelPatches = [];
};
kernel_2_6_31_zen5 = makeOverridable (import ../os-specific/linux/zen-kernel/zen-stable.nix) {
kernel_2_6_31_zen5 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.31-zen5.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools
lib builderDefs;
};
@ -5546,8 +5546,17 @@ let
ckSched = true;
};
kernel_2_6_31_zen = kernel_2_6_31_zen5;
kernel_2_6_31_zen_bfs = kernel_2_6_31_zen5_bfs;
kernel_2_6_31_zen7 = makeOverridable (import ../os-specific/linux/zen-kernel/zen-stable.nix) {
inherit fetchurl stdenv perl mktemp module_init_tools
lib builderDefs;
};
kernel_2_6_31_zen7_bfs = kernel_2_6_31_zen7.override {
ckSched = true;
};
kernel_2_6_31_zen = kernel_2_6_31_zen7;
kernel_2_6_31_zen_bfs = kernel_2_6_31_zen7_bfs;
/* Kernel modules are inherently tied to a specific kernel. So
rather than provide specific instances of those packages for a