[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#60224] [PATCH 8/9] gnu: u-boot-sifive-unmatched: Use gexps and remo
From: |
Maxim Cournoyer |
Subject: |
[bug#60224] [PATCH 8/9] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs. |
Date: |
Tue, 20 Dec 2022 13:34:26 -0500 |
* gnu/packages/bootloaders.scm (u-boot-sifive-unmatched)
[arguments]: Use gexps. Use search-input-file.
[inputs]: Remove labels. Use modify-inputs.
---
gnu/packages/bootloaders.scm | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index ce7be6f7b1..fa11fa4bc7 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1044,15 +1044,14 @@ (define-public u-boot-sifive-unmatched
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((opensbi (string-append (assoc-ref inputs "firmware")
- "/fw_dynamic.bin")))
- (setenv "OPENSBI" opensbi))))))))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'set-environment
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "OPENSBI" (search-input-file inputs
+ "fw_dynamic.bin"))))))))
(inputs
- `(("firmware" ,opensbi-generic)
- ,@(package-inputs base))))))
+ (modify-inputs (package-inputs base)
+ (append opensbi-generic))))))
(define-public u-boot-rock64-rk3328
(let ((base (make-u-boot-package "rock64-rk3328" "aarch64-linux-gnu")))
--
2.38.1
- [bug#60224] [PATCH 0/9] Improvements to our u-boot tooling, Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 1/9] gnu: make-u-boot-package: Add a u-boot argument and use gexps., Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 4/9] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps., Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 9/9] gnu: u-boot-puma-rk3399: Use make-u-boot-sunxi64-package., Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 7/9] gnu: u-boot-rock64-rk3328: Fix build., Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 3/9] gnu: make-uboot-package: Simplify build., Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 8/9] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs.,
Maxim Cournoyer <=
- [bug#60224] [PATCH 2/9] gnu: make-u-boot-package: Install .imx files., Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 5/9] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build., Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 6/9] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name., Maxim Cournoyer, 2022/12/20
- [bug#60224] [PATCH 0/9] Improvements to our u-boot tooling, Ricardo Wurmus, 2022/12/29