From 3277694825cdc3fb8993bbe42609dd93c8959971 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 13 Nov 2020 23:52:07 +0100 Subject: [PATCH] package/cryptsetup: really break circular dependency The commit [1] should fix a circular dependency by using util-linux-libs instead of util-linux if BR2_PACKAGE_UTIL_LINUX_LIBS is set. But util-linux is still in CRYPTSETUP_DEPENDENCIES. Remove it to really break the circular dependency. [1] e3c86f5c9e466ed5135e824d6dcebcfd7f5ac1ab Signed-off-by: Romain Naour Cc: Fabrice Fontaine Cc: Yann E. MORIN Reviewed-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/cryptsetup/cryptsetup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 60097595b4..a59a0c7570 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -9,7 +9,7 @@ CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ - lvm2 popt util-linux host-pkgconf json-c libargon2 \ + lvm2 popt host-pkgconf json-c libargon2 \ $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \ $(TARGET_NLS_DEPENDENCIES) -- 2.30.2