[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#60224] [PATCH v4 08/12] gnu: u-boot-rock64-rk3328: Fix build.
From: |
Maxim Cournoyer |
Subject: |
[bug#60224] [PATCH v4 08/12] gnu: u-boot-rock64-rk3328: Fix build. |
Date: |
Wed, 11 Jan 2023 15:44:29 -0500 |
* gnu/packages/bootloaders.scm (u-boot-rock64-rk3328)
[arguments]: Use gexps.
[native-inputs]: Remove input labels and use modify-inputs, and turn into...
[inputs]: ... this.
---
Changes in v4:
- Make arm-trusted-firmware-rk3328 a regular input
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 0c5205fa86..464c1f5729 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1145,14 +1145,13 @@ (define-public u-boot-rock64-rk3328
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((bl31 (search-input-file inputs "/bl31.elf")))
- (setenv "BL31" bl31))))))))
- (native-inputs
- `(("firmware" ,arm-trusted-firmware-rk3328)
- ,@(package-native-inputs base))))))
+ #~(modify-phases #$phases
+ (add-after 'unpack 'set-environment
+ (lambda* (#:key native-inputs inputs #:allow-other-keys)
+ (setenv "BL31 "(search-input-file inputs "bl31.elf"))))))))
+ (inputs
+ (modify-inputs (package-inputs base)
+ (append arm-trusted-firmware-rk3328))))))
(define-public u-boot-firefly-rk3399
(let ((base (make-u-boot-package "firefly-rk3399" "aarch64-linux-gnu")))
--
2.38.1
- [bug#60224] [PATCH v4 01/12] gnu: make-u-boot-package: Add a u-boot argument and use gexps., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 02/12] gnu: make-u-boot-package: Install .imx files., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 03/12] gnu: make-uboot-package: Simplify build., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 07/12] gnu: make-u-boot-sunxi64-package: Use gexps and adjust file name., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 06/12] gnu: u-boot-firefly-rk3399: Use gexps and fix cross-build., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 04/12] gnu: make-u-boot-package: Allow disabling cross-compilation., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 05/12] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 08/12] gnu: u-boot-rock64-rk3328: Fix build.,
Maxim Cournoyer <=
- [bug#60224] [PATCH v4 09/12] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 10/12] gnu: u-boot-rockpro64-rk3399: Fix build., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 12/12] gnu: u-boot-puma-rk3399: Fix build., Maxim Cournoyer, 2023/01/11
- [bug#60224] [PATCH v4 11/12] gnu: make-arm-trusted-firmware: Simplify build., Maxim Cournoyer, 2023/01/11