diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-03-01 23:06:41 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-03-02 15:52:54 +0100 |
| commit | f563d1990466e067e7c73eab553fe1ee20a44ffe (patch) | |
| tree | 9672b34146e79e0c5c83411aab5830f9cd7badeb | |
| parent | 0dae492195a0d6e54ed76e43902541bab4ead2e3 (diff) | |
| download | guix-f563d1990466e067e7c73eab553fe1ee20a44ffe.tar guix-f563d1990466e067e7c73eab553fe1ee20a44ffe.tar.gz | |
gnu: ovmf: Update phase style.
* gnu/packages/firmware.scm (ovmf): Substitute INVOKE for SYSTEM* and
end phases with #t.
| -rw-r--r-- | gnu/packages/firmware.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 1579ba472f..0e1539cf66 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -261,7 +261,7 @@ coreboot.") (setenv "WORKSPACE" cwd) (setenv "EDK_TOOLS_PATH" tools) (setenv "PATH" (string-append (getenv "PATH") ":" bin)) - (system* "bash" "edksetup.sh" "BaseTools") + (invoke "bash" "edksetup.sh" "BaseTools") (substitute* "Conf/target.txt" (("^TARGET[ ]*=.*$") "TARGET = RELEASE\n") (("^TOOL_CHAIN_TAG[ ]*=.*$") "TOOL_CHAIN_TAG = GCC49\n") @@ -270,14 +270,16 @@ coreboot.") (number->string (parallel-job-count))))) ;; Build build support. (setenv "BUILD_CC" "gcc") - (zero? (system* "make" "-C" (string-append tools "/Source/C")))))) + (invoke "make" "-C" (string-append tools "/Source/C")) + #t))) (add-after 'build 'build-ia32 (lambda _ (substitute* "Conf/target.txt" (("^TARGET_ARCH[ ]*=.*$") "TARGET_ARCH = IA32\n") (("^ACTIVE_PLATFORM[ ]*=.*$") "ACTIVE_PLATFORM = OvmfPkg/OvmfPkgIa32.dsc\n")) - (zero? (system* "build")))) + (invoke "build") + #t)) ,@(if (string=? "x86_64-linux" (%current-system)) '((add-after 'build 'build-x64 (lambda _ @@ -285,7 +287,8 @@ coreboot.") (("^TARGET_ARCH[ ]*=.*$") "TARGET_ARCH = X64\n") (("^ACTIVE_PLATFORM[ ]*=.*$") "ACTIVE_PLATFORM = OvmfPkg/OvmfPkgX64.dsc\n")) - (zero? (system* "build"))))) + (invoke "build") + #t))) '()) (delete 'build) (replace 'install |