[Buildroot] [PATCH 3/3] package/rpm: introduce rpm2archive option

Arnout Vandecappelle arnout at mind.be
Sat Sep 11 20:33:22 UTC 2021



On 04/09/2021 22:40, James Knight wrote:
> 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.

 I was a bit in doubt if it's really worth adding such an option. Why would you
not include rpm2archive? If it doesn't take a lot of additional space, there's
really no need to make it an option.

 That said, it doesn't really hurt, and if you do want rpm2archive it's
convenient to automatically get libarchive selected. So applied to master, thanks.

 Regards,
 Arnout

> 
> Signed-off-by: James Knight <james.d.knight at live.com>
> ---
>  package/rpm/Config.in | 15 +++++++++++++++
>  package/rpm/rpm.mk    | 14 +++++++-------
>  2 files changed, 22 insertions(+), 7 deletions(-)
> 
> diff --git a/package/rpm/Config.in b/package/rpm/Config.in
> index 9da8d51df0..2af04b41b4 100644
> --- a/package/rpm/Config.in
> +++ b/package/rpm/Config.in
> @@ -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
> diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
> index e9d2adf690..5c04d47f10 100644
> --- a/package/rpm/rpm.mk
> +++ b/package/rpm/rpm.mk
> @@ -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' \
> 


More information about the buildroot mailing list