package/cryptsetup: really break circular dependency
authorRomain Naour <romain.naour@gmail.com>
Fri, 13 Nov 2020 22:52:07 +0000 (23:52 +0100)
committerYann E. MORIN <yann.morin.1998@free.fr>
Sat, 14 Nov 2020 08:09:26 +0000 (09:09 +0100)
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 <romain.naour@gmail.com>
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Reviewed-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
package/cryptsetup/cryptsetup.mk

index 60097595b4fb4994f3fb5dfcbe510988c3faa95b..a59a0c75705b763dffac98b62b1e7b09deb2b65d 100644 (file)
@@ -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)