From e81228166e2349ded3d31d00642408ddb8a8d54e Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Thu, 29 Jul 2021 15:34:46 -0400
Subject: gnu: web: Move libyaml and libcyaml to (gnu packages serialization).

Files to be adjusted were searched with the following command:

 $ git ls-files | xargs grep -l -E ',libc?yaml' | \
       xargs grep -L '(gnu packages serialization)'

* gnu/packages/web.scm (libyaml, libyaml+static, libcyaml): Move to...
* gnu/packages/serialization.scm: ... here.
---
 gnu/packages/bootloaders.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gnu/packages/bootloaders.scm')

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 742992a119..3faf729727 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -59,11 +59,11 @@ (define-module (gnu packages bootloaders)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages sdl)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages swig)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages web)
   #:use-module (guix build-system gnu)
   #:use-module (guix download)
   #:use-module (guix git-download)
-- 
cgit v1.2.3


From adb84ae8ea95a6f956d81fdac0b5c6508024a541 Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Tue, 27 Jul 2021 20:15:55 +0100
Subject: 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(-)

(limited to 'gnu/packages/bootloaders.scm')

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 3faf729727..261184ff24 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 @@ (define-public u-boot-rockpro64-rk3399
         (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"))
-- 
cgit v1.2.3