From: Fabrice Fontaine Date: Sun, 28 Jun 2020 20:48:08 +0000 (+0200) Subject: package/cryptsetup: needs iconv X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d1b8433ebddf677f3039a7942cb739d3cfb4116f;p=buildroot.git package/cryptsetup: needs iconv iconv is a mantadory dependency since version 2.3.0 and https://github.com/mbroz/cryptsetup/commit/62c872eb4942ec37a18a37ea7cca1749757ddbb6 Fixes: - http://autobuild.buildroot.org/results/a13c4b64e8ac673df07d8dc1d33fae42a4f80fff Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- diff --git a/package/cryptsetup/Config.in b/package/cryptsetup/Config.in index c4281f7e26..d9c9d4d4f4 100644 --- a/package/cryptsetup/Config.in +++ b/package/cryptsetup/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_CRYPTSETUP select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_JSON_C select BR2_PACKAGE_LIBARGON2 + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help This tool helps manipulate dm-crypt and luks partitions for on-disk encryption. diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index 587ef0a810..68cc1543dc 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -9,6 +9,7 @@ CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 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 \ + $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ $(TARGET_NLS_DEPENDENCIES) CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library) CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL