[Buildroot] [PATCH] lvm2: replace !BR2_PACKAGE_LVM2_DMSETUP_ONLY by BR2_PACKAGE_LVM2_FULL_SUITE
Arnout Vandecappelle (Essensium/Mind)
arnout at mind.be
Sat Nov 23 23:50:24 UTC 2013
BR2_PACKAGE_LVM2_DMSETUP_ONLY is a "negative" option that disables
build and install of part of the suite. This option cannot be unselected
by other config options, which gives a problem for BR2_PACKAGE_UDISKS_LVM2:
it needs BR2_PACKAGE_LVM2_APP_LIBRARY, which requires the full suite.
Therefore, replace the negative BR2_PACKAGE_LVM2_DMSETUP_ONLY by a positive
BR2_PACKAGE_LVM2_FULL_SUITE. To make sure that existing defconfigs keep
working, the new option defaults to y unless the legacy
BR2_PACKAGE_LVM2_DMSETUP_ONLY was selected.
Fixes http://autobuild.buildroot.net/results/ea4627cae45e972ebba5b33a2b2871ce7f46fedc/
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
Note that in the legacy handling I've assumed that this will still
be taken in 2013.11.
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout at mind.be>
---
Config.in.legacy | 9 +++++++++
package/lvm2/Config.in | 10 ++++++----
package/lvm2/lvm2.mk | 2 +-
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index 587afe1..6f9050a 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -101,6 +101,15 @@ endif
###############################################################################
comment "Legacy options removed in 2013.11"
+config BR2_PACKAGE_LVM2_DMSETUP_ONLY
+ bool "lvm2's 'dmsetup only' option removed"
+ select BR2_LEGACY
+ help
+ The BR2_PACKAGE_LVM2_DMSETUP_ONLY was a negative option, which
+ led to problems with other packages that need the full lvm2
+ suite. Therefore, the option has been replaced with the positive
+ BR2_PACKAGE_LVM2_FULL_SUITE option.
+
config BR2_PACKAGE_QT_JAVASCRIPTCORE
bool "qt javascriptcore option removed"
select BR2_LEGACY
diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index b3988ea..849aab3 100644
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -16,16 +16,18 @@ config BR2_PACKAGE_LVM2
user-space. This makes it useful for not only LVM, but EVMS,
software raid, and other drivers that create "virtual" block devices.
-config BR2_PACKAGE_LVM2_DMSETUP_ONLY
- bool "install dmsetup only"
+config BR2_PACKAGE_LVM2_FULL_SUITE
+ bool "install the full LVM2 suite"
+ default y if !BR2_PACKAGE_LVM2_DMSETUP_ONLY # legacy 2013.11
depends on BR2_PACKAGE_LVM2
help
- Install dmsetup only and skip the LVM2 suite.
+ Install the full LVM2 suite. When this option is not set, only
+ dmsetup is installed.
config BR2_PACKAGE_LVM2_APP_LIBRARY
bool "install application library"
depends on BR2_PACKAGE_LVM2
- depends on !BR2_PACKAGE_LVM2_DMSETUP_ONLY
+ select BR2_PACKAGE_LVM2_FULL_SUITE
help
Install application library (liblvm2app).
diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk
index 79a0d05..698a212 100644
--- a/package/lvm2/lvm2.mk
+++ b/package/lvm2/lvm2.mk
@@ -38,7 +38,7 @@ else
LVM2_CONF_OPT += --disable-readline
endif
-ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y)
+ifeq ($(BR2_PACKAGE_LVM2_FULL_SUITE),)
LVM2_MAKE_OPT = device-mapper
LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper
--
1.8.4.3
More information about the buildroot
mailing list