[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/13: gnu: u-boot-rockpro64-rk3399: Use gexps and fix build.
From: |
guix-commits |
Subject: |
11/13: gnu: u-boot-rockpro64-rk3399: Use gexps and fix build. |
Date: |
Wed, 18 Jan 2023 21:08:32 -0500 (EST) |
apteryx pushed a commit to branch master
in repository guix.
commit ea0d3e1ec47171eb70f5c5ef25cff583138abfb9
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jan 1 19:25:25 2023 -0500
gnu: u-boot-rockpro64-rk3399: Use gexps and fix build.
* gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399)
[phases]: Use gexps.
[native-inputs]: Use modify-inputs and turn into...
[inputs]: ... this.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
gnu/packages/bootloaders.scm | 45 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index d9f9672f77..9da97232ea 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -1176,37 +1176,36 @@ partition."))
(arguments
(substitute-keyword-arguments (package-arguments base)
((#:phases phases)
- `(modify-phases ,phases
- (add-after 'unpack 'set-environment
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "BL31"
- (search-input-file inputs "/bl31.elf"))))
- (add-after 'unpack 'patch-header
- (lambda _
- (substitute* "include/config_distro_bootcmd.h"
- (("\"scsi_need_init=false")
- "\"setenv scsi_need_init false")
- (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;")
- "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv
scsi_need_init;"))
- (substitute* "include/configs/rockchip-common.h"
- (("#define BOOT_TARGET_DEVICES\\(func\\)")
- "
+ #~(modify-phases #$phases
+ (add-after 'unpack 'set-environment
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "BL31" (search-input-file inputs "/bl31.elf"))))
+ (add-after 'unpack 'patch-header
+ (lambda _
+ (substitute* "include/config_distro_bootcmd.h"
+ (("\"scsi_need_init=false")
+ "\"setenv scsi_need_init false")
+ (("#define BOOTENV_SET_SCSI_NEED_INIT \"scsi_need_init=;")
+ "#define BOOTENV_SET_SCSI_NEED_INIT \"setenv
scsi_need_init;"))
+ (substitute* "include/configs/rockchip-common.h"
+ (("#define BOOT_TARGET_DEVICES\\(func\\)")
+ "
#if CONFIG_IS_ENABLED(CMD_SCSI)
#define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0)
#else
#define BOOT_TARGET_SCSI(func)
#endif
#define BOOT_TARGET_DEVICES(func)")
- (("BOOT_TARGET_NVME\\(func\\) \\\\")
- "\
+ (("BOOT_TARGET_NVME\\(func\\) \\\\")
+ "\
BOOT_TARGET_NVME(func) \\
BOOT_TARGET_SCSI(func) \\"))))
- ;; Phases do not succeed on the bl31 ELF.
- (delete 'strip)
- (delete 'validate-runpath)))))
- (native-inputs
- `(("firmware" ,arm-trusted-firmware-rk3399)
- ,@(package-native-inputs base))))))
+ ;; Phases do not succeed on the bl31 ELF.
+ (delete 'strip)
+ (delete 'validate-runpath)))))
+ (inputs
+ (modify-inputs (package-inputs base)
+ (append arm-trusted-firmware-rk3399))))))
(define-public u-boot-pinebook-pro-rk3399
(let ((base (make-u-boot-package "pinebook-pro-rk3399" "aarch64-linux-gnu")))
- branch master updated (358ae8e12e -> 12f1b5fe4e), guix-commits, 2023/01/18
- 05/13: gnu: make-u-boot-package: Allow disabling cross-compilation., guix-commits, 2023/01/18
- 03/13: gnu: u-boot: Reduce the number of native inputs., guix-commits, 2023/01/18
- 06/13: gnu: u-boot-pinebook-pro-rk3399: Remove input labels and use gexps., guix-commits, 2023/01/18
- 11/13: gnu: u-boot-rockpro64-rk3399: Use gexps and fix build.,
guix-commits <=
- 12/13: gnu: make-arm-trusted-firmware: Simplify build., guix-commits, 2023/01/18
- 13/13: gnu: u-boot-puma-rk3399: Use gexps and fix build., guix-commits, 2023/01/18
- 04/13: gnu: make-uboot-package: Simplify build., guix-commits, 2023/01/18
- 01/13: gnu: make-u-boot-package: Add a u-boot argument and use gexps., guix-commits, 2023/01/18
- 02/13: gnu: make-u-boot-package: Install .imx files., guix-commits, 2023/01/18
- 07/13: gnu: u-boot-firefly-rk3399: Use gexps and fix build., guix-commits, 2023/01/18
- 08/13: gnu: make-u-boot-sunxi64-package: Use gexps and fix build., guix-commits, 2023/01/18
- 09/13: gnu: u-boot-rock64-rk3328: Use gexps and fix build., guix-commits, 2023/01/18
- 10/13: gnu: u-boot-sifive-unmatched: Use gexps and remove inputs labels., guix-commits, 2023/01/18