[Buildroot] [PATCH 2/3] package/rpm: explicit audit option

[Buildroot] [PATCH 2/3] package/rpm: explicit audit option

[James Knight]

Support for Linux audit has existed [1] since a v4.15 release; manage
the configuration option explicitly.

[1]: https://github.com/rpm-software-management/rpm/commit/ad16a04b6e41612cdef6ab8755ad31c8b880a9fd

Signed-off-by: James Knight <james.d.knight@live.com>
---
 package/rpm/rpm.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
index 816deceff7..e9d2adf690 100644
--- a/package/rpm/rpm.mk
+++ b/package/rpm/rpm.mk
@@ -38,6 +38,13 @@ else
 RPM_CONF_OPTS += --without-acl
 endif
 
+ifeq ($(BR2_PACKAGE_AUDIT),y)
+RPM_DEPENDENCIES += audit
+RPM_CONF_OPTS += --with-audit
+else
+RPM_CONF_OPTS += --without-audit
+endif
+
 ifeq ($(BR2_PACKAGE_DBUS),y)
 RPM_DEPENDENCIES += dbus
 RPM_CONF_OPTS += --enable-plugins
-- 
2.28.0.windows.1

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/3] package/rpm: explicit audit option

[Arnout Vandecappelle]

On 04/09/2021 22:40, James Knight wrote:
> Support for Linux audit has existed [1] since a v4.15 release; manage
> the configuration option explicitly.
> 
> [1]: https://github.com/rpm-software-management/rpm/commit/ad16a04b6e41612cdef6ab8755ad31c8b880a9fd
> 
> Signed-off-by: James Knight <james.d.knight@live.com>

 Applied to master, thanks.

 Regards,
 Arnout

> ---
>  package/rpm/rpm.mk | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk
> index 816deceff7..e9d2adf690 100644
> --- a/package/rpm/rpm.mk
> +++ b/package/rpm/rpm.mk
> @@ -38,6 +38,13 @@ else
>  RPM_CONF_OPTS += --without-acl
>  endif
>  
> +ifeq ($(BR2_PACKAGE_AUDIT),y)
> +RPM_DEPENDENCIES += audit
> +RPM_CONF_OPTS += --with-audit
> +else
> +RPM_CONF_OPTS += --without-audit
> +endif
> +
>  ifeq ($(BR2_PACKAGE_DBUS),y)
>  RPM_DEPENDENCIES += dbus
>  RPM_CONF_OPTS += --enable-plugins
> 
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[James Knight]

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>
---
 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' \
-- 
2.28.0.windows.1

_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[Arnout Vandecappelle]

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@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' \
> 
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

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

[James Knight]

Arnout,

On Sat, Sep 11, 2021 at 4:33 PM Arnout Vandecappelle <arnout@mind.be> wrote:
> 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.

There was not a specific reason for making this an option other than
providing developers more flexibility in their build process (maybe
shaving the (milli)seconds off a build and lazily avoiding the need to
manually exclude the option from a target, if someone does not want
said executable on a target).

I think the only main advantage from this patch is easily presenting
to a developer why "rpm2archive" may not be available, if they
need/want it.

I would have no problem with removing the option later, if it was
decided that it would be easier (for maintenance/etc.) to move back to
the automatically-build-it-if-libarchieve-is-available approach.
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot