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

package/rpm: introduce rpm2archive option

Browse Source 
Adjust the inclusion of the rpm2archive command as an option, to allow a
developer to opt-out of building/including the command if it is not
desired/needed for the target.

Signed-off-by: James Knight <james.d.knight@live.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
James Knight 2021-09-04 16:40:25 -04:00 committed by Arnout Vandecappelle (Essensium/Mind)
parent e7e3623324
commit 4c5e3896ef
2 changed files with 22 additions and 7 deletions
package/rpm
Config.inrpm.mk

15
package/rpm/Config.in
View File

@ -19,3 +19,18 @@ config BR2_PACKAGE_RPM
The RPM Package Manager (RPM).
http://www.rpm.org/
if BR2_PACKAGE_RPM
comment "rpm2archive support needs a toolchain w/ wchar"
depends on !BR2_USE_WCHAR
config BR2_PACKAGE_RPM_RPM2ARCHIVE
bool "rpm2archive command"
default y
depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBARCHIVE
help
Enable rpm2archive
endif

14
package/rpm/rpm.mk
View File

@ -73,13 +73,6 @@ else
RPM_CONF_OPTS += --without-libintl-prefix
endif
ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
RPM_DEPENDENCIES += libarchive
RPM_CONF_OPTS += --with-archive
else
RPM_CONF_OPTS += --without-archive
endif
ifeq ($(BR2_PACKAGE_LIBSELINUX),y)
RPM_DEPENDENCIES += libselinux
RPM_CONF_OPTS += --with-selinux
@ -101,6 +94,13 @@ else
RPM_CONF_OPTS += --disable-zstd
endif
ifeq ($(BR2_PACKAGE_RPM_RPM2ARCHIVE),y)
RPM_DEPENDENCIES += libarchive
RPM_CONF_OPTS += --with-archive
else
RPM_CONF_OPTS += --without-archive
endif
# ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`).
RPM_CONF_ENV = \
ac_cv_prog_cc_c99='-std=gnu99' \