Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Gabriel Valcazar 2021-04-09 13:42:48 +02:00 committed by Arturo Buzarra
parent 887fcae052
commit 77039b87df
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb
View File

@ -5,13 +5,13 @@ LICENSE = "MIT"
PACKAGE_INSTALL = " \ PACKAGE_INSTALL = " \
busybox \ busybox \
libubootenv-bin \
${@bb.utils.contains('STORAGE_MEDIA', 'mmc', 'e2fsprogs-mke2fs', '', d)} \ ${@bb.utils.contains('STORAGE_MEDIA', 'mmc', 'e2fsprogs-mke2fs', '', d)} \
${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'mtd-utils-ubifs', '', d)} \ ${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'mtd-utils-ubifs', '', d)} \
psplash \ psplash \
recovery-initramfs \ recovery-initramfs \
swupdate \ swupdate \
trustfence-tool \ trustfence-tool \
u-boot-fw-utils \
wipe \ wipe \
" "

2
meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
View File

@ -41,6 +41,7 @@ RDEPENDS_${PN} = "\
init-ifupdown \ init-ifupdown \
libdigiapix \ libdigiapix \
libgpiod \ libgpiod \
libubootenv-bin \
modutils-initscripts \ modutils-initscripts \
netbase \ netbase \
networkmanager \ networkmanager \
@ -50,7 +51,6 @@ RDEPENDS_${PN} = "\
recovery-utils \ recovery-utils \
sysinfo \ sysinfo \
system-monitor \ system-monitor \
u-boot-fw-utils \
usbutils \ usbutils \
${VIRTUAL-RUNTIME_base-utils} \ ${VIRTUAL-RUNTIME_base-utils} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${VIRTUAL-RUNTIME_base-utils-acpid}', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${VIRTUAL-RUNTIME_base-utils-acpid}', d)} \

2
meta-digi-dey/recipes-core/recovery/recovery-utils.bb
View File

@ -4,7 +4,7 @@ SUMMARY = "Recovery reboot utilities"
LICENSE = "MPL-2.0" LICENSE = "MPL-2.0"
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
DEPENDS = "u-boot-fw-utils" DEPENDS = "libubootenv"
PV = "0.1" PV = "0.1"

2
meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c
View File

@ -26,7 +26,7 @@
#include <sys/reboot.h> #include <sys/reboot.h>
#include <unistd.h> #include <unistd.h>
#include <libubootenv/ubootenv.h> #include "libuboot.h"
#define FILE_PREFIX "file://" #define FILE_PREFIX "file://"

2
meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/recovery-reboot/Makefile
View File

@ -32,7 +32,7 @@ CFLAGS += -Wall -DGIT_REVISION=\"$(if $(GIT_REVISION),-g$(GIT_REVISION))\"
# #
CFLAGS += -I../include CFLAGS += -I../include
LDFLAGS += -L../lib LDFLAGS += -L../lib
LDLIBS += -lrecovery -lubootenv LDLIBS += -lrecovery -lubootenv -lz
all: $(PROGRAM) all: $(PROGRAM)

2
meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
View File

@ -26,12 +26,12 @@ FILES_${PN} = "/"
# Runtime packages used in 'trustfence-initramfs-init' # Runtime packages used in 'trustfence-initramfs-init'
RDEPENDS_${PN} = " \ RDEPENDS_${PN} = " \
libubootenv-bin \
${@bb.utils.contains('STORAGE_MEDIA', 'mmc', 'cryptsetup', '', d)} \ ${@bb.utils.contains('STORAGE_MEDIA', 'mmc', 'cryptsetup', '', d)} \
${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'mtd-utils-ubifs', '', d)} \ ${@bb.utils.contains('STORAGE_MEDIA', 'mtd', 'mtd-utils-ubifs', '', d)} \
trustfence-tool \ trustfence-tool \
util-linux-findfs \ util-linux-findfs \
wipe \ wipe \
u-boot-fw-utils \
" "
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"