Commit 0d67ffe5 authored by Baruch Siach's avatar Baruch Siach Committed by Thomas Petazzoni
Browse files

cryptsetup: remove e2fsprogs dependency 



cryptsetup does not actually depend on e2fsprogs, but on libuuid that is a
dependency of e2fsprogs. Remove the e2fsprogs dependency, and add a direct
dependency on util-linux (libuuid provider).

Cc: Martin Hicks <mort@bork.org>
Signed-off-by: default avatarBaruch Siach <baruch@tkos.co.il>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 18fa4a32

package/cryptsetup/Config.in

+3 −2
Original line number Diff line number Diff line
@@ -2,10 +2,11 @@ config BR2_PACKAGE_CRYPTSETUP 
	bool "cryptsetup"

	select BR2_PACKAGE_POPT

	select BR2_PACKAGE_LVM2

	select BR2_PACKAGE_E2FSPROGS

	select BR2_PACKAGE_UTIL_LINUX

	select BR2_PACKAGE_UTIL_LINUX_LIBUUID

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE

	depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2

	depends on BR2_USE_MMU # lvm2, e2fsprogs

	depends on BR2_USE_MMU # lvm2

	depends on !BR2_STATIC_LIBS # lvm2

	depends on BR2_USE_WCHAR # util-linux

	# Triggers the _gp link issue

package/cryptsetup/cryptsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ CRYPTSETUP_VERSION_MAJOR = 1.6 
CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).7

CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz

CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR)

CRYPTSETUP_DEPENDENCIES = lvm2 popt e2fsprogs host-pkgconf \

CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \

	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)

CRYPTSETUP_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library)

CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL