diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2018-07-14 20:55:36 +0300 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2018-07-14 20:56:03 +0300 |
commit | 0a34402b19b0563e3723f26fadb3681537e08faf (patch) | |
tree | 5ef4a8dd48b913971fbf42369448ed01712daa9d /gnu/packages/bootloaders.scm | |
parent | 8911d85b9c361c53df9a9b70ae7f8b03fbdb5b49 (diff) | |
parent | 5908818e309280b124b64f5320e4b98210093061 (diff) | |
download | guix-0a34402b19b0563e3723f26fadb3681537e08faf.tar guix-0a34402b19b0563e3723f26fadb3681537e08faf.tar.gz |
Merge remote-tracking branch 'origin/master' into qt-updates
Diffstat (limited to 'gnu/packages/bootloaders.scm')
-rw-r--r-- | gnu/packages/bootloaders.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 73130b7312..7599f4ac25 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -425,8 +425,7 @@ def test_ctrl_c")) (apply invoke "make" "tools_defconfig" make-flags))) (replace 'build (lambda* (#:key inputs make-flags #:allow-other-keys) - (apply invoke "make" "tools-only" make-flags) - (apply invoke "make" "envtools" make-flags))) + (apply invoke "make" "tools-all" make-flags))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -443,7 +442,8 @@ def test_ctrl_c")) "tools/mkimage" "tools/proftool" "tools/fdtgrep" - "tools/env/fw_printenv")) + "tools/env/fw_printenv" + "tools/sunxi-spl-image-builder")) #t))) (delete 'check) (add-after 'install 'check @@ -519,7 +519,8 @@ board-independent tools."))) (let ((target-file (string-append libexec "/" file))) (mkdir-p (dirname target-file)) (copy-file file target-file))) - uboot-files)))))))))) + uboot-files) + #t))))))))) (define-public u-boot-vexpress (make-u-boot-package "vexpress_ca9x4" "arm-linux-gnueabihf")) |