From 77039b87dfe152258225fd5a5316a0f7ed89bff1 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Fri, 9 Apr 2021 13:42:48 +0200
Subject: [PATCH] gatesgarth migration: Convert u-boot-fw-utils dependencies to
 libubootenv dependencies

Modify the recovery-utils code to reflect the change (change in C header and
linked libraries)

https://jira.digi.com/browse/DEL-7410

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../recipes-core/images/dey-image-recovery-initramfs.bb         | 2 +-
 .../recipes-core/packagegroups/packagegroup-dey-core.bb         | 2 +-
 meta-digi-dey/recipes-core/recovery/recovery-utils.bb           | 2 +-
 .../recovery/recovery-utils/recovery-utils/lib/recovery.c       | 2 +-
 .../recovery-utils/recovery-utils/recovery-reboot/Makefile      | 2 +-
 meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb b/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb
index e53606405..54a78c8d7 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb
@@ -5,13 +5,13 @@ LICENSE = "MIT"
 
 PACKAGE_INSTALL = " \
     busybox \
+    libubootenv-bin \
     ${@bb.utils.contains('STORAGE_MEDIA', 'mmc', 'e2fsprogs-mke2fs', '', d)} \
     ${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'mtd-utils-ubifs', '', d)} \
     psplash \
     recovery-initramfs \
     swupdate \
     trustfence-tool \
-    u-boot-fw-utils \
     wipe \
 "
 
diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
index e839a21f9..e7b81cdb1 100644
--- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
+++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
@@ -41,6 +41,7 @@ RDEPENDS_${PN} = "\
     init-ifupdown \
     libdigiapix \
     libgpiod \
+    libubootenv-bin \
     modutils-initscripts \
     netbase \
     networkmanager \
@@ -50,7 +51,6 @@ RDEPENDS_${PN} = "\
     recovery-utils \
     sysinfo \
     system-monitor \
-    u-boot-fw-utils \
     usbutils \
     ${VIRTUAL-RUNTIME_base-utils} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${VIRTUAL-RUNTIME_base-utils-acpid}', d)} \
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-utils.bb b/meta-digi-dey/recipes-core/recovery/recovery-utils.bb
index d8e2f0009..e9ae30761 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-utils.bb
+++ b/meta-digi-dey/recipes-core/recovery/recovery-utils.bb
@@ -4,7 +4,7 @@ SUMMARY = "Recovery reboot utilities"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
-DEPENDS = "u-boot-fw-utils"
+DEPENDS = "libubootenv"
 
 PV = "0.1"
 
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c b/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c
index 1f4c1b9ab..ace2cee66 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c
+++ b/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c
@@ -26,7 +26,7 @@
 #include <sys/reboot.h>
 #include <unistd.h>
 
-#include <libubootenv/ubootenv.h>
+#include "libuboot.h"
 
 #define FILE_PREFIX	"file://"
 
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/recovery-reboot/Makefile b/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/recovery-reboot/Makefile
index fbb89852d..f65b4ba84 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/recovery-reboot/Makefile
+++ b/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/recovery-reboot/Makefile
@@ -32,7 +32,7 @@ CFLAGS += -Wall -DGIT_REVISION=\"$(if $(GIT_REVISION),-g$(GIT_REVISION))\"
 #
 CFLAGS  += -I../include
 LDFLAGS += -L../lib
-LDLIBS  += -lrecovery -lubootenv
+LDLIBS  += -lrecovery -lubootenv -lz
 
 all: $(PROGRAM)
 
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
index b5d7ac002..ad6620112 100644
--- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
+++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
@@ -26,12 +26,12 @@ FILES_${PN} = "/"
 
 # Runtime packages used in 'trustfence-initramfs-init'
 RDEPENDS_${PN} = " \
+    libubootenv-bin \
     ${@bb.utils.contains('STORAGE_MEDIA', 'mmc', 'cryptsetup', '', d)} \
     ${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'mtd-utils-ubifs', '', d)} \
     trustfence-tool \
     util-linux-findfs \
     wipe \
-    u-boot-fw-utils \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"