summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2013-12-12 18:18:40 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2013-12-12 22:52:46 (GMT)
commitb1f2cbb40950a73741dfa578f43f2a5e88cdd953 (patch)
treecdae3c68832e02fd33be87731a9272eadb81b747
parent9c69a48a7204d15db19b849d43204b1f332c7867 (diff)
downloadbuildroot-b1f2cbb40950a73741dfa578f43f2a5e88cdd953.tar.gz
buildroot-b1f2cbb40950a73741dfa578f43f2a5e88cdd953.tar.bz2
package/parted: relax dependency on lvm2
parted can be configured without support for LVM volumes, so we can relax the dependency on lvm2, and make it an optional feature. Remove now no-longer needed dependency on MMU because of lvm2. (Based on a code-snippet from Thomas.) Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/parted/Config.in3
-rw-r--r--package/parted/parted.mk9
2 files changed, 8 insertions, 4 deletions
diff --git a/package/parted/Config.in b/package/parted/Config.in
index 8af2693..321fdf7 100644
--- a/package/parted/Config.in
+++ b/package/parted/Config.in
@@ -2,8 +2,6 @@ config BR2_PACKAGE_PARTED
bool "parted"
depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR
- depends on BR2_USE_MMU # lvm2
- select BR2_PACKAGE_LVM2
select BR2_PACKAGE_READLINE
select BR2_PACKAGE_UTIL_LINUX
select BR2_PACKAGE_UTIL_LINUX_LIBUUID
@@ -13,5 +11,4 @@ config BR2_PACKAGE_PARTED
http://www.gnu.org/software/parted/
comment "parted needs a toolchain w/ largefile, wchar"
- depends on BR2_USE_MMU
depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/parted/parted.mk b/package/parted/parted.mk
index 773e332..231ab35 100644
--- a/package/parted/parted.mk
+++ b/package/parted/parted.mk
@@ -7,9 +7,16 @@
PARTED_VERSION = 3.1
PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz
PARTED_SITE = $(BR2_GNU_MIRROR)/parted
-PARTED_DEPENDENCIES = readline util-linux lvm2
+PARTED_DEPENDENCIES = readline util-linux
PARTED_INSTALL_STAGING = YES
PARTED_LICENSE = GPLv3+
PARTED_LICENSE_FILES = COPYING
+ifeq ($(BR2_PACKAGE_LVM2),y)
+PARTED_DEPENDENCIES += lvm2
+PARTED_CONF_OPT += --enable-device-mapper
+else
+PARTED_CONF_OPT += --disable-device-mapper
+endif
+
$(eval $(autotools-package))