From 25edf486060092a1805ff821d325af495781c37f Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 19 Jul 2022 21:00:50 +0200 Subject: [PATCH] boot/uboot: add BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX option Since U-Boot 2022.04 a host dependency to util-linux (-luuid) is required if the U-Boot board configuration has CONFIG_TOOLS_MKEFICAPSULE enabled. So introduce a new BR U-Boot config option BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX to solve this problem. Signed-off-by: Heiko Thiery [yann.morin.1998@free.fr: fix check-package] Signed-off-by: Yann E. MORIN --- boot/uboot/Config.in | 8 ++++++++ boot/uboot/uboot.mk | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index 91d98c7e63..557472b58b 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -190,6 +190,14 @@ config BR2_TARGET_UBOOT_NEEDS_GNUTLS typically the case when the board configuration has CONFIG_TOOLS_MKEFICAPSULE enabled. +config BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX + bool "U-Boot needs util-linux" + help + Select this option if your U-Boot board configuration + requires util-linux (-luuid) to be available on the host. + This is typically the case when the board configuration + has CONFIG_TOOLS_MKEFICAPSULE enabled. + config BR2_TARGET_UBOOT_NEEDS_ATF_BL31 bool "U-Boot needs ATF BL31" depends on BR2_TARGET_ARM_TRUSTED_FIRMWARE diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 5808e30818..70d4d585f7 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -231,6 +231,10 @@ ifeq ($(BR2_TARGET_UBOOT_NEEDS_GNUTLS),y) UBOOT_DEPENDENCIES += host-gnutls endif +ifeq ($(BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX),y) +UBOOT_DEPENDENCIES += host-util-linux +endif + # prior to u-boot 2013.10 the license info was in COPYING. Copy it so # legal-info finds it define UBOOT_COPY_OLD_LICENSE_FILE