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

9 files changed, 10 insertions, 232 deletions

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 66971780b048e..0000000000000
--- 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 3dcfede595ab9..0000000000000
--- 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 3309d91d3805f..0000000000000
--- 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 1f1872fa4def8..0000000000000
--- 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 6b5c86a1dd405..777edc5f0d05c 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 72b7dea1fb62a..0000000000000
--- 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 72b7dea1fb62a..0000000000000
--- 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 647c9aee158bc..e71297b146dbc 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 8a1e6d11fba52..7b0d5cd8708c6 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;
@@ -63,6 +63,9 @@ in
     killOption CONFIG_IMA
   '' +
   ''
+    killOption CONFIG_USB_OTG_BLACKLIST_HUB
+  ''+
+  ''
     killOption CONFIG_KERNEL_BZIP2
     killOption CONFIG_KERNEL_LZMA
     setOptionYes CONFIG_KERNEL_GZIP