branch master updated: gnu: u-boot-rockpro64-rk3399: Enable 'set-environment phase.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

planglois pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new adb84ae  gnu: u-boot-rockpro64-rk3399: Enable 'set-environment phase.
adb84ae is described below

commit adb84ae8ea95a6f956d81fdac0b5c6508024a541
Author: Pierre Langlois <pierre.langlois@gmx.com>
AuthorDate: Tue Jul 27 20:15:55 2021 +0100

    gnu: u-boot-rockpro64-rk3399: Enable 'set-environment phase.
    
    Fixes <https://bugs.gnu.org/49550>.
    
    * gnu/packages/bootloaders.scm (u-boot-rockpro64-rk3399)[arguments]: Run
    'set-environment phase after 'unpack instead of non-existent
    'patch-rockpro64-config phase.
---
 gnu/packages/bootloaders.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 3faf729..261184f 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2018, 2019, 2020 Vagrant Cascadian <vagrant@debian.org>
-;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;; Copyright © 2021 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
 ;;;
@@ -931,7 +931,7 @@ to Novena upstream, does not load u-boot.img from the first 
partition.")
         (substitute-keyword-arguments (package-arguments base)
           ((#:phases phases)
            `(modify-phases ,phases
-              (add-after 'patch-rockpro64-config 'set-environment
+              (add-after 'unpack 'set-environment
                 (lambda* (#:key inputs #:allow-other-keys)
                   (setenv "BL31" (string-append (assoc-ref inputs "firmware")
                                                 "/bl31.elf"))