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

package/dovecot: Remove bzip2 and zlib options

Browse Source 
The next patch of this series will add optional xz and lz4 support, to
avoid adding new options for these compression packages simplify the
configuration of dovecot by removing the options handling optional
compression support.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2016-02-10 21:58:17 +01:00 committed by Thomas Petazzoni
parent 95b2874fc5
commit f39ac4d288
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Config.in.legacy
View File

@ -145,6 +145,20 @@ endif
############################################################################### ###############################################################################
comment "Legacy options removed in 2016.02" comment "Legacy options removed in 2016.02"
config BR2_PACKAGE_DOVECOT_BZIP2
bool "bzip2 support option has been removed"
select BR2_LEGACY
select BR2_PACKAGE_BZIP2
help
Bzip2 support is built if the bzip2 package is selected.
config BR2_PACKAGE_DOVECOT_ZLIB
bool "zlib support option has been removed"
select BR2_LEGACY
select BR2_PACKAGE_ZLIB
help
Zlib support is built if the zlib package is selected.
config BR2_PACKAGE_E2FSPROGS_FINDFS config BR2_PACKAGE_E2FSPROGS_FINDFS
bool "e2fsprogs findfs option has been removed" bool "e2fsprogs findfs option has been removed"
select BR2_LEGACY select BR2_LEGACY

12
package/dovecot/Config.in
View File

@ -13,12 +13,6 @@ config BR2_PACKAGE_DOVECOT
if BR2_PACKAGE_DOVECOT if BR2_PACKAGE_DOVECOT
config BR2_PACKAGE_DOVECOT_BZIP2
bool "bzip2 support"
select BR2_PACKAGE_BZIP2
help
Enable bzip2 support.
config BR2_PACKAGE_DOVECOT_MYSQL config BR2_PACKAGE_DOVECOT_MYSQL
bool "mysql support" bool "mysql support"
select BR2_PACKAGE_MYSQL select BR2_PACKAGE_MYSQL
@ -43,12 +37,6 @@ config BR2_PACKAGE_DOVECOT_SQLITE
help help
Enable SQLite support. Enable SQLite support.
config BR2_PACKAGE_DOVECOT_ZLIB
bool "zlib support"
select BR2_PACKAGE_ZLIB
help
Enable zlib support.
source package/dovecot-pigeonhole/Config.in source package/dovecot-pigeonhole/Config.in
endif # BR2_PACKAGE_DOVECOT endif # BR2_PACKAGE_DOVECOT

4
package/dovecot/dovecot.mk
View File

@ -33,7 +33,7 @@ ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL)$(BR2_PACKAGE_DOVECOT_SQLITE),)
DOVECOT_CONF_OPTS += --without-sql DOVECOT_CONF_OPTS += --without-sql
endif endif
ifeq ($(BR2_PACKAGE_DOVECOT_BZIP2),y) ifeq ($(BR2_PACKAGE_BZIP2),y)
DOVECOT_CONF_OPTS += --with-bzlib DOVECOT_CONF_OPTS += --with-bzlib
DOVECOT_DEPENDENCIES += bzip2 DOVECOT_DEPENDENCIES += bzip2
else else
@ -76,7 +76,7 @@ else
DOVECOT_CONF_OPTS += --without-sqlite DOVECOT_CONF_OPTS += --without-sqlite
endif endif
ifeq ($(BR2_PACKAGE_DOVECOT_ZLIB),y) ifeq ($(BR2_PACKAGE_ZLIB),y)
DOVECOT_CONF_OPTS += --with-zlib DOVECOT_CONF_OPTS += --with-zlib
DOVECOT_DEPENDENCIES += zlib DOVECOT_DEPENDENCIES += zlib
else else