Skip to contentSkip to conversation

cryptsetup: remove e2fsprogs dependency

PATCH New Baruch Siach 2 participants 2 messages Jul 2, 2015 – Jul 4, 2015

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/cryptsetup/Config.in     | 5 +++--
 package/cryptsetup/cryptsetup.mk | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
package/cryptsetup/Config.in +3 -2
index 13b0184cffd6..d7ccd379e6df 100644
@@ -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
index 754bea575592..3655d5dfbd58 100644
@@ -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
Signature · 1 line
2.1.4
Applied
#1 lore raw

PATCH 1/1 cryptsetup: remove e2fsprogs dependency

Dear Baruch Siach,

Quoted 10 lines · Baruch Siach

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 <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/cryptsetup/Config.in     | 5 +++--
 package/cryptsetup/cryptsetup.mk | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

Applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com