diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-03-01 15:21:24 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-03-01 15:21:24 +0000 |
commit | 95e22a39c723457e8578890005115bcd48c4132d (patch) | |
tree | c4717b0659c9688ae31e387cf79b2932d491d12a /pkgs/misc/uboot | |
parent | 7869d22938db12959ee7530b4098fb26e43f5765 (diff) | |
download | nixlib-95e22a39c723457e8578890005115bcd48c4132d.tar nixlib-95e22a39c723457e8578890005115bcd48c4132d.tar.gz nixlib-95e22a39c723457e8578890005115bcd48c4132d.tar.bz2 nixlib-95e22a39c723457e8578890005115bcd48c4132d.tar.lz nixlib-95e22a39c723457e8578890005115bcd48c4132d.tar.xz nixlib-95e22a39c723457e8578890005115bcd48c4132d.tar.zst nixlib-95e22a39c723457e8578890005115bcd48c4132d.zip |
Trying to make uboot not annoy the nixpkgs tarball. Tested.
svn path=/nixpkgs/trunk/; revision=20310
Diffstat (limited to 'pkgs/misc/uboot')
-rw-r--r-- | pkgs/misc/uboot/default.nix | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 60bf372b8db9..7730921cbfe8 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, unzip, platform}: +# This does not cover the case for cross-building, but we need some filtering +# for the normal stdenv, in order to build the nixpkgs tarball assert (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") || (stdenv ? cross); @@ -14,20 +16,22 @@ stdenv.mkDerivation { # patches = [ ./gas220.patch ]; # Remove the cross compiler prefix, and add reiserfs support - configurePhase = '' - make mrproper - make ${platform.ubootConfig} NBOOT=1 LE=1 - sed -i /CROSS_COMPILE/d include/config.mk - ''; - - buildPhase = '' - unset src - if test -z "$crossConfig"; then - make clean all - else - make clean all ARCH=${platform.kernelArch} CROSS_COMPILE=$crossConfig- - fi - ''; + configurePhase = assert (platform ? ubootConfig); + '' + make mrproper + make ${platform.ubootConfig} NBOOT=1 LE=1 + sed -i /CROSS_COMPILE/d include/config.mk + ''; + + buildPhase = assert (platform ? kernelArch); + '' + unset src + if test -z "$crossConfig"; then + make clean all + else + make clean all ARCH=${platform.kernelArch} CROSS_COMPILE=$crossConfig- + fi + ''; buildNativeInputs = [ unzip ]; |