[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: install-buildroot-u-boot: Add post-image-script.
From: |
guix-commits |
Subject: |
01/01: gnu: install-buildroot-u-boot: Add post-image-script. |
Date: |
Mon, 2 Sep 2019 21:11:11 -0400 (EDT) |
dannym pushed a commit to branch wip-buildroot
in repository guix.
commit b9e9ada82b4ed6e5d1e7048cfd12dc100b4fc358
Author: Danny Milosavljevic <address@hidden>
Date: Tue Sep 3 03:10:13 2019 +0200
gnu: install-buildroot-u-boot: Add post-image-script.
* gnu/bootloader/u-boot.scm (install-buildroot-u-boot): Modify.
(buildroot->guix-package): Use it.
---
gnu/bootloader/u-boot.scm | 5 ++++-
guix/import/buildroot.scm | 6 +++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/bootloader/u-boot.scm b/gnu/bootloader/u-boot.scm
index 001edc5..efd696d 100644
--- a/gnu/bootloader/u-boot.scm
+++ b/gnu/bootloader/u-boot.scm
@@ -91,10 +91,13 @@
(write-file-on-device u-boot (stat:size (stat u-boot))
device (* 512 512)))))
-(define install-buildroot-u-boot
+(define (install-buildroot-u-boot post-image-script post-script-args)
#~(lambda (bootloader device mount-point)
;; FIXME: Take genimage and a custom config from buildroot in order to
install bootloader.
#$genimage
+ #$buildroot-boards
+ #$post-image-script
+ #$post-script-args
#f))
diff --git a/guix/import/buildroot.scm b/guix/import/buildroot.scm
index 0ae06de..c21614d 100644
--- a/guix/import/buildroot.scm
+++ b/guix/import/buildroot.scm
@@ -140,4 +140,8 @@
,(if (eq? (assoc-ref buildroot-configuration "BR2_aarch64") 'y)
"aarch64-linux-gnu"
"arm-linux-gnueabihf")))
- (installer install-buildroot-u-boot))))))))
+ (installer (install-buildroot-u-boot
+ ,(assoc-ref buildroot-configuration
+ "BR2_ROOTFS_POST_IMAGE_SCRIPT")
+ ,(assoc-ref buildroot-configuration
+ "BR2_ROOTFS_POST_SCRIPT_ARGS"))))))))))