From 2fccf41b94a7b735ffdce99c634834270d2c1d78 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 22 Jan 2007 11:05:17 +0000 Subject: [PATCH] * Put the platform in the config file name. svn path=/nixpkgs/trunk/; revision=7737 --- ...fig-2.6.19.1-up => config-2.6.19.1-i686-up} | 0 pkgs/os-specific/linux/kernel/linux-2.6.19.nix | 2 +- pkgs/top-level/all-packages.nix | 18 ------------------ 3 files changed, 1 insertion(+), 19 deletions(-) rename pkgs/os-specific/linux/kernel/{config-2.6.19.1-up => config-2.6.19.1-i686-up} (100%) diff --git a/pkgs/os-specific/linux/kernel/config-2.6.19.1-up b/pkgs/os-specific/linux/kernel/config-2.6.19.1-i686-up similarity index 100% rename from pkgs/os-specific/linux/kernel/config-2.6.19.1-up rename to pkgs/os-specific/linux/kernel/config-2.6.19.1-i686-up diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.19.nix b/pkgs/os-specific/linux/kernel/linux-2.6.19.nix index 45f5214225e..c78260433b2 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.19.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches = map (p: p.patch) kernelPatches; - config = ./config-2.6.19.1-up; + config = ./config-2.6.19.1-i686-up; buildInputs = [perl mktemp]; arch="i386"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7826e59765f..04822873140 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2192,24 +2192,6 @@ rec { kernel = kernel_2_6_19; - kernel_2_6_18 = import ../os-specific/linux/kernel/linux-2.6.18.nix { - inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ - { name = "skas-2.6.18-v9-pre9"; - patch = fetchurl { - url = http://www.user-mode-linux.org/~blaisorblade/patches/skas3-2.6/skas-2.6.18-v9-pre9/skas-2.6.18-v9-pre9.patch.bz2; - md5 = "f7f45fd71464c1091d06eae692ee4ac0"; - }; - } - { name = "fbsplash-0.9.2-r5-2.6.18-rc4"; - patch = fetchurl { - url = http://dev.gentoo.org/~spock/projects/gensplash/archive/fbsplash-0.9.2-r5-2.6.18-rc4.patch; - md5 = "4bc612e21ae03e9727aa87969185ccdc"; - }; - } - ]; - }; - kernel_2_6_19 = import ../os-specific/linux/kernel/linux-2.6.19.nix { inherit fetchurl stdenv perl mktemp module_init_tools; kernelPatches = [