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

Fix building and unpacking of the ARM boostrap tools.

Browse Source 
NOTE: This is incomplete - the tools need to be built, uploaded and the references fixed.
This commit is contained in:
Ambroz Bizjak
2015-02-05 21:26:55 +01:00
parent cf317b85ad
commit 8fb7d8bede
5 changed files with 138 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/default.nix
+3 -4
View File
@@ -16,7 +16,7 @@ rec {
else if system == "x86_64-linux" then import ./bootstrap/x86_64.nix
else if system == "armv5tel-linux" then import ./bootstrap/armv5tel.nix
else if system == "armv6l-linux" then import ./bootstrap/armv6l.nix
else if system == "armv7l-linux" then import ./bootstrap/armv6l.nix
else if system == "armv7l-linux" then import ./bootstrap/armv7l.nix
else if system == "mips64el-linux" then import ./bootstrap/loongson2f.nix
else abort "unsupported platform for the pure Linux stdenv";
@@ -42,10 +42,9 @@ rec {
builder = bootstrapFiles.busybox;
args =
if system == "armv5tel-linux" || system == "armv6l-linux"
args = if system == "armv5tel-linux" || system == "armv6l-linux"
|| system == "armv7l-linux"
then [ ./scripts/unpack-bootstrap-tools-arm.sh ]
then [ "ash" "-e" ./scripts/unpack-bootstrap-tools-arm.sh ]
else [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ];
tarball = bootstrapFiles.bootstrapTools;