Author: viric
Date: Thu Aug 5 18:51:12 2010
New Revision: 22973
URL: https://svn.nixos.org/websvn/nix/?rev=22973&sc=1
Log:
More changes beyond stdenv-linux for the fuloong2f platform
Modified:
nixpkgs/branches/stdenv-updates/pkgs/lib/platforms.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/platforms.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/lib/platforms.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/lib/platforms.nix Thu Aug 5
18:47:40 2010 (r22972)
+++ nixpkgs/branches/stdenv-updates/pkgs/lib/platforms.nix Thu Aug 5
18:51:12 2010 (r22973)
@@ -2,7 +2,8 @@
rec {
gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
- linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux" ];
+ linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux"
+ "ict_loongson-2_v0.3_fpu_v0.1-linux"];
darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"];
freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"];
openbsd = ["i686-openbsd" "x86_64-openbsd"];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Thu Aug 5 18:47:40 2010 (r22972)
+++ nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
Thu Aug 5 18:51:12 2010 (r22973)
@@ -41,7 +41,7 @@
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
- || stdenv.system == "armv5tel-linux";
+ || stdenv.system == "armv5tel-linux" || stdenv.system ==
"ict_loongson-2_v0.3_fpu_v0.1-linux";
assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
@@ -96,6 +96,7 @@
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "armv5tel-linux" then "arm" else
+ if stdenv.system == "ict_loongson-2_v0.3_fpu_v0.1-linux" then "mips" else
abort "Platform ${stdenv.system} is not supported.";
crossAttrs = let
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/platforms.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/platforms.nix Thu Aug
5 18:47:40 2010 (r22972)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/platforms.nix Thu Aug
5 18:51:12 2010 (r22973)
@@ -203,5 +203,6 @@
FUSE_FS m
'';
kernelTarget = "vmlinux";
+ uboot = null;
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
