diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix new file mode 100644 index 00000000000..60c72bb2a5d --- /dev/null +++ b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix @@ -0,0 +1,74 @@ +args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? "", + kernelPatches ? [], extraMeta ? {}, + features ? {}, preConfigure ? "", + ...}: + +let + conf = import ../kernel/config-blocks.nix; + +in + +import ../kernel/generic.nix ( + rec { + version = "2.6.32-zen4"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.bz2"; + sha256 = "0kjhnkf2ldivagczs16q49zm2lr3khh01pqrlsc7sh5qh1npi6ah"; + }; + + kernelPatches = [ + { + patch = runCommand "2.6.32-zen4.patch" {} "${xz}/bin/lzma -d < ${ fetchurl { + name = "2.6.32-zen4"; + url = "http://downloads.zen-kernel.org/2.6.32/2.6.32-zen4.patch.lzma"; + sha256 = "1dyp9sfigqjfqw1c94010c521bhcy1xnzp91kkhg3dwgzfpsp2k2"; + } } > $out"; + } + ] + ++ + stdenv.lib.attrByPath ["kernelPatches"] [] args; + + features = { + iwlwifi = true; + zen = true; + fbConDecor = true; + aufs = true; + } // args.features; + + config = with conf; + '' + ${generalOptions} + ${noDebug} + ${virtualisation} + ${if stdenv.lib.attrByPath ["oldI686"] false args.features then noPAE else ""} + ${usefulSubsystems} + ${cfq} + ${noNUMA} + ${networking} + ${wireless} + ${fb} + ${fbConDecor} + ${sound} + ${usbserial} + ${fsXattr} + ${security} + ${blockDevices} + ${bluetooth} + ${misc} + ${if stdenv.lib.attrByPath ["ckShed"] false args.features then bfsched else ""} + ''; + + preConfigure = '' + mv README.zen README-zen + '' + stdenv.lib.attrByPath ["preConfigure"] "" args; + + extraMeta = { + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = with stdenv.lib.platforms; + linux; + } // args.extraMeta; + } + // removeAttrs args ["extraConfig" "extraMeta" "features" "kernelPatches" + "xz" "runCommand" "preConfigure"] +) diff --git a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen5.nix b/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen5.nix deleted file mode 100644 index fed3b4555ad..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen5.nix +++ /dev/null @@ -1,7 +0,0 @@ -rec { - version="cd9caea74b8f90e8dded45a93a173f0f5c5aef25"; - name="zen-linux-cd9caea74b8f90e8dded45a93a173f0f5c5aef25"; - hash="86e254d1aab17a66d7f5a83d93430b11dbeb95be1ee06f1d6a4c36219e4dfaf4"; - rev="cd9caea74b8f90e8dded45a93a173f0f5c5aef25"; - url="git://zen-kernel.org/kernel/zen-stable.git"; -} diff --git a/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix b/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix deleted file mode 100644 index a3d78137553..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix +++ /dev/null @@ -1,7 +0,0 @@ -rec { - version="66a44aa93959818bdb8153fea27b0992197ebc54"; - name="zen-linux-66a44aa93959818bdb8153fea27b0992197ebc54"; - hash="f5c86214424c8a7202c2dd9bbbd800561940af00800edb8afab080a73c185bca"; - rev="66a44aa93959818bdb8153fea27b0992197ebc54"; - url="git://zen-kernel.org/kernel/zen-stable.git"; -} diff --git a/pkgs/os-specific/linux/zen-kernel/src-info-for-default.nix b/pkgs/os-specific/linux/zen-kernel/src-info-for-default.nix deleted file mode 100644 index c06385aac35..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/src-info-for-default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - repoUrl = "http://git.zen-sources.org/zen.git"; - rev = "origin/master"; - baseName = "zen-linux"; - method = "fetchgit"; -} diff --git a/pkgs/os-specific/linux/zen-kernel/src-info-for-zen-stable.nix b/pkgs/os-specific/linux/zen-kernel/src-info-for-zen-stable.nix deleted file mode 100644 index e71297b146d..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/src-info-for-zen-stable.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - repoUrl = "git://zen-kernel.org/kernel/zen-stable.git"; - rev = "origin/master"; - baseName = "zen-linux"; - method = "fetchgit"; -} diff --git a/pkgs/os-specific/linux/zen-kernel/zen-stable.nix b/pkgs/os-specific/linux/zen-kernel/zen-stable.nix deleted file mode 100644 index dfc8828068e..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/zen-stable.nix +++ /dev/null @@ -1,102 +0,0 @@ -a : -let - s = import ./src-for-zen-stable.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-zen7"; - 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} - ''; -})