From c6c91297615c6467786e63bd03ac220d23a9066b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 23 Oct 2009 05:21:54 +0000 Subject: [PATCH] Removing references to old zen-kernels that are in archived branches; Updating from zen-sources.org to zen-kernel.org; Updating revision; Adding patch by Pierre to enable external hubs svn path=/nixpkgs/trunk/; revision=17930 --- .../linux/zen-kernel/2.6.31-zen0.nix | 96 ------------------ .../linux/zen-kernel/2.6.31-zen2.nix | 99 ------------------- .../linux/zen-kernel/src-for-2.6.31-zen0.nix | 9 -- .../linux/zen-kernel/src-for-2.6.31-zen2.nix | 9 -- .../linux/zen-kernel/src-for-zen-stable.nix | 10 +- .../src-info-for-2.6.31-zen-any.nix | 6 -- .../zen-kernel/src-info-for-2.6.31-zen2.nix | 6 -- .../zen-kernel/src-info-for-zen-stable.nix | 2 +- .../linux/zen-kernel/zen-stable.nix | 5 +- pkgs/top-level/all-packages.nix | 18 ++-- 10 files changed, 16 insertions(+), 244 deletions(-) delete mode 100644 pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix delete mode 100644 pkgs/os-specific/linux/zen-kernel/2.6.31-zen2.nix delete mode 100644 pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen0.nix delete mode 100644 pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen2.nix delete mode 100644 pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen-any.nix delete mode 100644 pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen2.nix diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix deleted file mode 100644 index 66971780b04..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen0.nix +++ /dev/null @@ -1,96 +0,0 @@ -a : -let - s = import ./src-for-2.6.31-zen0.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-zen0"; - 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_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 - ''+ - (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} - ''; -}) diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen2.nix b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen2.nix deleted file mode 100644 index 3dcfede595a..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen2.nix +++ /dev/null @@ -1,99 +0,0 @@ -a : -let - s = import ./src-for-2.6.31-zen2.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-zen2"; - 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_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} - ''; -}) diff --git a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen0.nix b/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen0.nix deleted file mode 100644 index 3309d91d380..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen0.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="dea7da967ccc58d0fbb4adc7671a1c85f6211da0"; - name="zen-linux-dea7da967ccc58d0fbb4adc7671a1c85f6211da0"; - hash="65ff82897af27b9f01d459f4ec116d5568c971327efa892ae67bd0abf06136b2"; - rev="dea7da967ccc58d0fbb4adc7671a1c85f6211da0"; - url="http://git.zen-sources.org/zen.git"; - - -} diff --git a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen2.nix b/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen2.nix deleted file mode 100644 index 1f1872fa4de..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen2.nix +++ /dev/null @@ -1,9 +0,0 @@ -rec { - version="6530055a9a4e32e7a0e3dd0fa85f032f8d6c3020"; - name="zen-linux-6530055a9a4e32e7a0e3dd0fa85f032f8d6c3020"; - hash="08cef774b433d9e41b71c4f43308bb1da112960f5d272aeca2e0e0d10bacc779"; - rev="6530055a9a4e32e7a0e3dd0fa85f032f8d6c3020"; - url="http://git.zen-sources.org/zen.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 index 6b5c86a1dd4..777edc5f0d0 100644 --- a/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix +++ b/pkgs/os-specific/linux/zen-kernel/src-for-zen-stable.nix @@ -1,9 +1,9 @@ rec { - version="5692deda2c65ef19b303c96c8524dcacb310bc70"; - name="zen-linux-5692deda2c65ef19b303c96c8524dcacb310bc70"; - hash="4a89d26c44897babe4f7f69890c1045bdc49d94a39c42534418e2d20dbc3b809"; - rev="5692deda2c65ef19b303c96c8524dcacb310bc70"; - url="git://zen-sources.org/kernel/zen-stable.git"; + 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-info-for-2.6.31-zen-any.nix b/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen-any.nix deleted file mode 100644 index 72b7dea1fb6..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen-any.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - repoUrl = "http://git.zen-sources.org/zen.git"; - rev = "origin/master-2.6.31"; - baseName = "zen-linux"; - method = "fetchgit"; -} diff --git a/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen2.nix b/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen2.nix deleted file mode 100644 index 72b7dea1fb6..00000000000 --- a/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen2.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - repoUrl = "http://git.zen-sources.org/zen.git"; - rev = "origin/master-2.6.31"; - 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 index 647c9aee158..e71297b146d 100644 --- 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 @@ -1,5 +1,5 @@ { - repoUrl = "git://zen-sources.org/kernel/zen-stable.git"; + 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 index 8a1e6d11fba..7b0d5cd8708 100644 --- a/pkgs/os-specific/linux/zen-kernel/zen-stable.nix +++ b/pkgs/os-specific/linux/zen-kernel/zen-stable.nix @@ -6,7 +6,7 @@ in inherit (a) stdenv fetchurl perl mktemp module_init_tools; src = a.builderDefs.fetchGitFromSrcInfo s; - version = "2.6.31-zen2"; + version = "2.6.31-zen5"; config = "./kernel-config"; features = { iwlwifi = true; @@ -62,6 +62,9 @@ in killOption CONFIG_IMA '' + + '' + killOption CONFIG_USB_OTG_BLACKLIST_HUB + ''+ '' killOption CONFIG_KERNEL_BZIP2 killOption CONFIG_KERNEL_LZMA diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index edc41dc522f..22cb3dee352 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5704,23 +5704,17 @@ let oldI686 = true; }); - kernel_2_6_31_zen0 = makeOverridable (import ../os-specific/linux/zen-kernel/2.6.31-zen0.nix) { + kernel_2_6_31_zen5 = makeOverridable (import ../os-specific/linux/zen-kernel/zen-stable.nix) { inherit fetchurl stdenv perl mktemp module_init_tools lib builderDefs; }; - kernel_2_6_31_zen0_bfs = kernel_2_6_31_zen0.override { + kernel_2_6_31_zen5_bfs = kernel_2_6_31_zen5.override { ckSched = true; }; - kernel_2_6_31_zen2 = makeOverridable (import ../os-specific/linux/zen-kernel/zen-stable.nix) { - inherit fetchurl stdenv perl mktemp module_init_tools - lib builderDefs; - }; - - kernel_2_6_31_zen2_bfs = kernel_2_6_31_zen2.override { - 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 modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -5857,8 +5851,8 @@ let kernelPackages_2_6_31_rc3_old_i686 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc3_old_i686); kernelPackages_2_6_31_rc2 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc2); kernelPackages_2_6_31_rc2_old_i686 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_rc2_old_i686); - kernelPackages_2_6_31_zen0 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen0); - kernelPackages_2_6_31_zen2 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen2); + kernelPackages_2_6_31_zen5 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen5); + kernelPackages_2_6_31_zen = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31_zen); kernelPackages_2_6_31 = recurseIntoAttrs (kernelPackagesFor kernel_2_6_31); # The current default kernel / kernel modules.