public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trying to get a better expression for uboot upstream, allowing normal and cross build

Browse Source 
with proper assertions.


svn path=/nixpkgs/trunk/; revision=20319
This commit is contained in:
Lluís Batlle i Rossell 2010-03-01 23:22:48 +00:00
parent 0bae3266eb
commit eb047010f8
2 changed files with 40 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
pkgs/misc/uboot/default.nix
View File

@ -1,9 +1,23 @@
{stdenv, fetchurl, unzip, platform}: {stdenv, fetchurl, unzip}:
# This does not cover the case for cross-building, but we need some filtering let
# for the normal stdenv, in order to build the nixpkgs tarball platform = stdenv.platform;
assert (stdenv.system != "i686-linux" && stdenv.system != "x86_64-linux") configureFun = ubootConfig :
|| (stdenv ? cross); ''
make mrproper
make ${ubootConfig} NBOOT=1 LE=1
'';
buildFun = kernelArch :
''
unset src
if test -z "$crossConfig"; then
make clean all
else
make clean all ARCH=${kernelArch} CROSS_COMPILE=$crossConfig-
fi
'';
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "uboot-2009.11"; name = "uboot-2009.11";
@ -13,26 +27,6 @@ stdenv.mkDerivation {
sha256 = "1rld7q3ww89si84g80hqskd1z995lni5r5xc4d4322n99wqiarh6"; sha256 = "1rld7q3ww89si84g80hqskd1z995lni5r5xc4d4322n99wqiarh6";
}; };
# patches = [ ./gas220.patch ];
# Remove the cross compiler prefix, and add reiserfs support
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 ]; buildNativeInputs = [ unzip ];
dontStrip = true; dontStrip = true;
@ -46,4 +40,24 @@ stdenv.mkDerivation {
ensureDir $out/bin ensureDir $out/bin
cp tools/{envcrc,mkimage} $out/bin cp tools/{envcrc,mkimage} $out/bin
''; '';
configurePhase =
assert platform ? uboot && platform.uboot != null;
assert (platform ? ubootConfig);
configureFun platform.ubootConfig;
buildPhase = assert (platform ? kernelArch);
buildFun platform.kernelArch;
crossAttrs = let
cp = stdenv.cross.platform;
in
assert cp ? uboot && cp.uboot != null;
{
configurePhase = assert (cp ? ubootConfig);
configureFun cp.ubootConfig;
buildPhase = assert (cp ? kernelArch);
buildFun cp.kernelArch;
};
} }

2
pkgs/top-level/all-packages.nix
View File

@ -6344,7 +6344,7 @@ let
else throw "Unknown uboot"; else throw "Unknown uboot";
ubootUpstream = makeOverridable (import ../misc/uboot) { ubootUpstream = makeOverridable (import ../misc/uboot) {
inherit fetchurl stdenv unzip platform; inherit fetchurl stdenv unzip;
}; };
ubootSheevaplug = makeOverridable (import ../misc/uboot/sheevaplug.nix) { ubootSheevaplug = makeOverridable (import ../misc/uboot/sheevaplug.nix) {