[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#60224] [PATCH v5 08/13] gnu: make-u-boot-sunxi64-package: Use gexps
From: |
Maxim Cournoyer |
Subject: |
[bug#60224] [PATCH v5 08/13] gnu: make-u-boot-sunxi64-package: Use gexps and fix build. |
Date: |
Sun, 15 Jan 2023 22:25:39 -0500 |
* gnu/packages/bootloaders.scm (make-u-boot-sunxi64-package)
[native-inputs]: Turn into...
[inputs]: ... this.
---
Changes in v5:
- Fix commit message
Changes in v4:
- Revert erroneously replaced firmware package
- Revert bl31.bin -> bl31.elf change caused by the above
- Make the arm-trusted-firmware-sun50i-a64 a host input
gnu/packages/bootloaders.scm | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 624a832802..53e6557ac7 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1001,17 +1001,13 @@ (define*-public (make-u-boot-sunxi64-package board
triplet
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key native-inputs inputs #:allow-other-keys)
- (let ((bl31
- (string-append
- (assoc-ref (or native-inputs inputs) "firmware")
- "/bl31.bin")))
- (setenv "BL31" bl31))))))))
- (native-inputs
- `(("firmware" ,arm-trusted-firmware-sun50i-a64)
- ,@(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.bin"))))))))
+ (inputs
+ (modify-inputs (package-inputs base)
+ (append arm-trusted-firmware-sun50i-a64))))))
(define-public u-boot-pine64-plus
(make-u-boot-sunxi64-package "pine64_plus" "aarch64-linux-gnu"))
--
2.38.1
- [bug#60224] [PATCH v5 01/13] gnu: make-u-boot-package: Add a u-boot argument and use gexps., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 02/13] gnu: make-u-boot-package: Install .imx files., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 03/13] gnu: u-boot: Reduce the number of native inputs., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 04/13] gnu: make-uboot-package: Simplify build., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 06/13] gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 07/13] gnu: u-boot-firefly-rk3399: Use gexps and fix build., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 05/13] gnu: make-u-boot-package: Allow disabling cross-compilation., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 08/13] gnu: make-u-boot-sunxi64-package: Use gexps and fix build.,
Maxim Cournoyer <=
- [bug#60224] [PATCH v5 09/13] gnu: u-boot-rock64-rk3328: Use gexps and fix build., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 11/13] gnu: u-boot-rockpro64-rk3399: Use gexps and fix build., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 13/13] gnu: u-boot-puma-rk3399: Use gexps and fix build., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 12/13] gnu: make-arm-trusted-firmware: Simplify build., Maxim Cournoyer, 2023/01/15
- [bug#60224] [PATCH v5 10/13] gnu: u-boot-sifive-unmatched: Use gexps and remove inputs labels., Maxim Cournoyer, 2023/01/15
- bug#60224: [PATCH 0/9] Improvements to our u-boot tooling, Maxim Cournoyer, 2023/01/18