Message ID | 1385625108-31742-1-git-send-email-arnout@mind.be |
---|---|
State | Superseded |
Headers | show |
"Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be> wrote: >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> >--- >Note that in the legacy handling I've assumed that this will still >be taken in 2013.11. > >v2: > - Rename the new symbol to BR2_PACKAGE_LVM2_STANDARD_INSTALL > >Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> >--- > Config.in.legacy | 12 ++++++++++++ > package/lvm2/Config.in | 16 ++++++++++------ > package/lvm2/lvm2.mk | 2 +- > 3 files changed, 23 insertions(+), 7 deletions(-) > >diff --git a/Config.in.legacy b/Config.in.legacy >index 587afe1..c629256 100644 >--- a/Config.in.legacy >+++ b/Config.in.legacy >@@ -101,6 +101,18 @@ 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. Name needs to be changed here too. >+ >+# 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 > bool "qt javascriptcore option removed" > select BR2_LEGACY >diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in >index b3988ea..b523dba 100644 >--- a/package/lvm2/Config.in >+++ b/package/lvm2/Config.in >@@ -16,19 +16,23 @@ 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" >- depends on BR2_PACKAGE_LVM2 >+if 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 >- 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 > bool "install application library" >- depends on BR2_PACKAGE_LVM2 >- depends on !BR2_PACKAGE_LVM2_DMSETUP_ONLY >+ select BR2_PACKAGE_LVM2_FULL_SUITE And here. > help > Install application library (liblvm2app). > >+endif >+ > comment "lvm2 needs a toolchain w/ largefile" > depends on BR2_USE_MMU > depends on !BR2_LARGEFILE >diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk >index 79a0d05..4099c21 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_STANDARD_INSTALL),) > 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
diff --git a/Config.in.legacy b/Config.in.legacy index 587afe1..c629256 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -101,6 +101,18 @@ 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. + +# 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 bool "qt javascriptcore option removed" select BR2_LEGACY diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in index b3988ea..b523dba 100644 --- a/package/lvm2/Config.in +++ b/package/lvm2/Config.in @@ -16,19 +16,23 @@ 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" - depends on BR2_PACKAGE_LVM2 +if 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 - 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 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). +endif + comment "lvm2 needs a toolchain w/ largefile" depends on BR2_USE_MMU depends on !BR2_LARGEFILE diff --git a/package/lvm2/lvm2.mk b/package/lvm2/lvm2.mk index 79a0d05..4099c21 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_STANDARD_INSTALL),) 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