gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

package/rpm: don't use sub-options for bzip2 and xz features

Browse Source 
Allow enabling features depends on the relying packages.

Add the old sub-options to Config.in.legacy.

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Romain Naour 2015-01-18 20:53:08 +01:00 committed by Thomas Petazzoni
parent 652414095e
commit 3c476540d1
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Config.in.legacy
View File

@ -102,6 +102,22 @@ endif
comment "Legacy options removed in 2015.02"
config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
bool "rpm's bzip2 payloads option has been removed"
select BR2_LEGACY
select BR2_PACKAGE_BZIP2
help
The bzip2 payloads option rely entirely on the dependant package bzip2.
So, you need to select it to enable this feature.
config BR2_PACKAGE_RPM_XZ_PAYLOADS
bool "rpm's xz payloads option has been removed"
select BR2_LEGACY
select BR2_PACKAGE_XZ
help
The xz payloads option rely entirely on the dependant package xz.
So, you need to select it to enable this feature.
config BR2_PACKAGE_M4
bool "m4 target package removed"
select BR2_LEGACY

19
package/rpm/Config.in
View File

@ -19,22 +19,3 @@ config BR2_PACKAGE_RPM
The RPM package management system.
http://rpm5.org
if BR2_PACKAGE_RPM
config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
bool "support for bzip2 payloads"
select BR2_PACKAGE_BZIP2
help
Support for bzip2 payloads in RPM.
config BR2_PACKAGE_RPM_XZ_PAYLOADS
bool "support for xz payloads"
depends on BR2_INSTALL_LIBSTDCPP
help
Support for xz payloads in RPM.
comment "xz payload support needs a toolchain w/ C++"
depends on !BR2_INSTALL_LIBSTDCPP
endif

5
package/rpm/rpm.mk
View File

@ -44,11 +44,12 @@ else
RPM_CONF_OPTS += --with-file=no
endif
ifeq ($(BR2_PACKAGE_RPM_XZ_PAYLOADS),y)
# xz payload support needs a toolchain w/ C++
ifeq ($(BR2_PACKAGE_XZ)$(BR2_INSTALL_LIBSTDCPP),yy)
RPM_CONF_OPTS += --with-xz
endif
ifeq ($(BR2_PACKAGE_RPM_BZIP2_PAYLOADS),y)
ifeq ($(BR2_PACKAGE_BZIP2),y)
RPM_CONF_OPTS += --with-bzip2
RPM_DEPENDENCIES += bzip2
endif