Author: viric
Date: Sun Aug 1 20:57:13 2010
New Revision: 22840
URL: https://svn.nixos.org/websvn/nix/?rev=22840&sc=1
Log:
Some first changes to get some evaluation working on the fuloong2f
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/platforms.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
Sun Aug 1 15:14:33 2010 (r22839)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
Sun Aug 1 20:57:13 2010 (r22840)
@@ -61,6 +61,9 @@
/* Make sure `nscd' et al. are linked against `libssp'. */
./stack-protector-link.patch
+
+ /* Fix for the check of -fgnu89-inline compiler flag */
+ ./gnu89-inline.patch
]
++ stdenv.lib.optional (fetchgit == null)
/* MOD_NANO definition, for ntp (taken from glibc upstream) */
@@ -86,7 +89,7 @@
"--build=arm-linux-gnueabi"
"--without-fp"
];
-
+
buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
++ stdenv.lib.optional (mig != null) mig;
@@ -149,7 +152,7 @@
mkdir ../build
cd ../build
- configureScript="../$sourceRoot/configure"
+ configureScript="`pwd`/../$sourceRoot/configure"
${preConfigure}
'';
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
Sun Aug 1 15:14:33 2010 (r22839)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
Sun Aug 1 20:57:13 2010 (r22840)
@@ -20,6 +20,7 @@
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.system == "armv5tel-linux" then "arm" else
+ if stdenv.system == "mips64-linux" then "mips" else
abort "don't know what the kernel include directory is called for this
platform";
buildInputs = [perl];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
Sun Aug 1 15:14:33 2010 (r22839)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
Sun Aug 1 20:57:13 2010 (r22840)
@@ -26,6 +26,7 @@
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.system == "armv5tel-linux" then "arm" else
+ if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
abort "don't know what the kernel include directory is called for this
platform";
buildInputs = [perl];
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix Sun Aug
1 15:14:33 2010 (r22839)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/default.nix Sun Aug
1 20:57:13 2010 (r22840)
@@ -94,7 +94,8 @@
isLinux = result.system == "i686-linux"
|| result.system == "x86_64-linux"
|| result.system == "powerpc-linux"
- || result.system == "armv5tel-linux";
+ || result.system == "armv5tel-linux"
+ || result.system == "ict_loongson-2_v0.3_fpu_v0.1-linux";
isSunOS = result.system == "i386-sunos";
isi686 = result.system == "i686-linux"
|| result.system == "i686-darwin"
Modified:
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
Sun Aug 1 15:14:33 2010 (r22839)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
Sun Aug 1 20:57:13 2010 (r22840)
@@ -80,7 +80,7 @@
cp ${bzip2}/bin/bzip2 $out/bin
cp -d ${gnumake}/bin/* $out/bin
cp -d ${patch}/bin/* $out/bin
- cp ${patchelf05}/bin/* $out/bin
+ cp ${patchelf}/bin/* $out/bin
cp ${replace}/bin/* $out/bin
cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sun Aug
1 15:14:33 2010 (r22839)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sun Aug
1 20:57:13 2010 (r22840)
@@ -6258,7 +6258,7 @@
inherit fetchurl stdenv bison flex autoconf automake;
};
- linuxHeaders = linuxHeaders_2_6_28;
+ linuxHeaders = linuxHeaders_2_6_32;
linuxHeaders26Cross = forceBuildDrv (import
../os-specific/linux/kernel-headers/2.6.32.nix {
inherit stdenv fetchurl perl;
@@ -6849,11 +6849,9 @@
inherit fetchurl stdenv unzip;
};
-/*
uclibc = import ../os-specific/linux/uclibc {
inherit fetchurl stdenv linuxHeaders;
};
-*/
uclibcCross = import ../os-specific/linux/uclibc {
inherit fetchurl stdenv libiconv;
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/platforms.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/platforms.nix Sun Aug
1 15:14:33 2010 (r22839)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/platforms.nix Sun Aug
1 20:57:13 2010 (r22840)
@@ -152,4 +152,56 @@
uboot = "upstream";
ubootConfig = "integratorcp_config";
};
+
+ fuloong2f_n32 = {
+ name = "fuloong2f_n32";
+ kernelMajor = "2.6";
+ kernelHeadersBaseConfig = "fuloong2e_defconfig";
+ kernelBaseConfig = "fuloong2e_defconfig";
+ kernelArch = "mips";
+ kernelAutoModules = false;
+ kernelExtraConfig =
+ ''
+ BLK_DEV_RAM y
+ BLK_DEV_INITRD y
+ BLK_DEV_CRYPTOLOOP m
+ BLK_DEV_DM m
+ DM_CRYPT m
+ MD y
+ REISERFS_FS m
+ EXT4_FS m
+ USB_STORAGE_CYPRESS_ATACB m
+
+ IP_PNP y
+ NFS_FS y
+ ROOT_NFS y
+ TUN m
+ NFS_V4 y
+ NFS_V4_1 y
+ NFS_FSCACHE y
+ NFSD m
+ NFSD_V2_ACL y
+ NFSD_V3 y
+ NFSD_V3_ACL y
+ NFSD_V4 y
+
+ # Fail to build
+ DRM n
+ SCSI_ADVANSYS n
+ USB_ISP1362_HCD n
+ SND_SOC n
+ SND_ALI5451 n
+ FB_SAVAGE n
+ SCSI_NSP32 n
+ ATA_SFF n
+ SUNGEM n
+ IRDA n
+ ATM_HE n
+ SCSI_ACARD n
+ BLK_DEV_CMD640_ENHANCED n
+
+ FUSE_FS m
+ '';
+ kernelTarget = "vmlinux";
+ };
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
