NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lvm2: replace !BR2_PACKAGE_LVM2_DMSETUP_ONLY by BR2_PACKAGE_LVM2_STANDARD_INSTALL

Browse Source 
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_STANDARD_INSTALL. 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@mind.be>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Arnout Vandecappelle 2013-11-28 09:29:28 +01:00 committed by Peter Korsgaard
parent 62d15df19a
commit ff0f55e381
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Config.in.legacy
View File

@ -101,6 +101,18 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2013.11" 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_STANDARD_INSTALL option.
# Note: BR2_PACKAGE_LVM2_DMSETUP_ONLY is still referenced in package/lvm2/Config.in
# in order to automatically propagate old configs
config BR2_PACKAGE_QT_JAVASCRIPTCORE config BR2_PACKAGE_QT_JAVASCRIPTCORE
bool "qt javascriptcore option removed" bool "qt javascriptcore option removed"
select BR2_LEGACY select BR2_LEGACY

16
package/lvm2/Config.in
View File

@ -16,19 +16,23 @@ config BR2_PACKAGE_LVM2
user-space. This makes it useful for not only LVM, but EVMS, user-space. This makes it useful for not only LVM, but EVMS,
software raid, and other drivers that create "virtual" block devices. software raid, and other drivers that create "virtual" block devices.
config BR2_PACKAGE_LVM2_DMSETUP_ONLY if BR2_PACKAGE_LVM2
bool "install dmsetup only"
depends on BR2_PACKAGE_LVM2 config BR2_PACKAGE_LVM2_STANDARD_INSTALL
bool "standard install instead of only dmsetup"
default y if !BR2_PACKAGE_LVM2_DMSETUP_ONLY # legacy 2013.11
help help
Install dmsetup only and skip the LVM2 suite. Install the standard suite of lvm2 programs. When this option is not
set, only dmsetup is installed.
config BR2_PACKAGE_LVM2_APP_LIBRARY config BR2_PACKAGE_LVM2_APP_LIBRARY
bool "install application library" bool "install application library"
depends on BR2_PACKAGE_LVM2 select BR2_PACKAGE_LVM2_STANDARD_INSTALL
depends on !BR2_PACKAGE_LVM2_DMSETUP_ONLY
help help
Install application library (liblvm2app). Install application library (liblvm2app).
endif
comment "lvm2 needs a toolchain w/ largefile" comment "lvm2 needs a toolchain w/ largefile"
depends on BR2_USE_MMU depends on BR2_USE_MMU
depends on !BR2_LARGEFILE depends on !BR2_LARGEFILE

2
package/lvm2/lvm2.mk
View File

@ -38,7 +38,7 @@ else
LVM2_CONF_OPT += --disable-readline LVM2_CONF_OPT += --disable-readline
endif endif
ifeq ($(BR2_PACKAGE_LVM2_DMSETUP_ONLY),y) ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),)
LVM2_MAKE_OPT = device-mapper LVM2_MAKE_OPT = device-mapper
LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper LVM2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install_device-mapper
LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper LVM2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install_device-mapper