From a05baf4f4328ce2ca6da6860f6e596cd7559a08a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Tue, 24 Dec 2019 18:24:37 +0100 Subject: [PATCH 1/2] system: operating-system-boot-parameters-file: Fix cross-compilation. * gnu/system.scm (operating-system-boot-parameters-file): Add system and target arguments and pass them to gexp->file call, (operating-system-directory-base-entries): pass current system and target to operating-system-boot-parameters-file procedure. --- gnu/system.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index abdbb081e6..e7af7e7b47 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -470,7 +470,10 @@ value of the SYSTEM-SERVICE-TYPE service." (let ((locale (operating-system-locale-directory os))) (mlet %store-monad ((kernel -> (operating-system-kernel os)) (initrd -> (operating-system-initrd-file os)) - (params (operating-system-boot-parameters-file os))) + (params (operating-system-boot-parameters-file + os + #:system (%current-system) + #:target (%current-target-system)))) (return `(("kernel" ,kernel) ("parameters" ,params) ("initrd" ,initrd) @@ -1048,8 +1051,12 @@ such as '--root' and '--load' to ." (_ device))) -(define* (operating-system-boot-parameters-file os - #:key system-kernel-arguments?) +(define* (operating-system-boot-parameters-file + os + #:key + system-kernel-arguments? + system + target) "Return a file that describes the boot parameters of OS. The primary use of this file is the reconstruction of GRUB menu entries for old configurations. @@ -1085,7 +1092,9 @@ being stored into the \"parameters\" file)." (device #$(device->sexp (boot-parameters-store-device params))) (mount-point #$(boot-parameters-store-mount-point params)))) - #:set-load-path? #f))) + #:set-load-path? #f + #:system system + #:target target))) (define-gexp-compiler (operating-system-compiler (os ) system target) -- 2.24.1