Re: [Buildroot] [PATCH 3/8] package/opkg: add zstd support

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Adam Duskett <adam.duskett@amarulasolutions.com>
Cc: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>,
	buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 3/8] package/opkg: add zstd support
Date: Mon, 23 Oct 2023 19:25:48 +0200	[thread overview]
Message-ID: <20231023172548.GZ2607@scaer> (raw)
In-Reply-To: <20231023092501.481436-3-adam.duskett@amarulasolutions.com>

Adam, All,

On 2023-10-23 11:24 +0200, Adam Duskett spake thusly:
> Signed-off-by: Adam Duskett <adam.duskett@amarulasolutions.com>
> ---
>  package/opkg/Config.in | 8 ++++++++
>  package/opkg/opkg.mk   | 9 ++++++++-
>  2 files changed, 16 insertions(+), 1 deletion(-)
> 
> diff --git a/package/opkg/Config.in b/package/opkg/Config.in
> index 1f6a39343f..c3c2463393 100644
> --- a/package/opkg/Config.in
> +++ b/package/opkg/Config.in
> @@ -30,4 +30,12 @@ config BR2_PACKAGE_OPKG_GPG_SIGN
>  	  Enable opkg package signature checking support using
>  	  gnupg/libgpgme.
>  
> +comment "compression support"
> +
> +config BR2_PACKAGE_OPKG_ZSTD
> +	bool "zstd support"
> +	select BR2_PACKAGE_ZSTD
> +	help
> +	  Enable zstd compressor support.

The usual way if a library is optional, is to rely on that library being
enabled by the user, not by adding options for each.

So I dropped the option, and...

>  endif
> diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk
> index 9b1ffb3c74..605d4de82f 100644
> --- a/package/opkg/opkg.mk
> +++ b/package/opkg/opkg.mk
> @@ -10,7 +10,7 @@ OPKG_DEPENDENCIES = host-pkgconf libarchive
>  OPKG_LICENSE = GPL-2.0+
>  OPKG_LICENSE_FILES = COPYING
>  OPKG_INSTALL_STAGING = YES
> -OPKG_CONF_OPTS = --disable-curl --disable-zstd
> +OPKG_CONF_OPTS = --disable-curl
>  
>  # Ensure directory for lockfile exists
>  define OPKG_CREATE_LOCKDIR
> @@ -27,6 +27,13 @@ else
>  OPKG_CONF_OPTS += --disable-gpg
>  endif
>  
> +ifeq ($(BR2_PACKAGE_OPKG_ZSTD),y)

... changed this to directly depend on the zstd libray to be enabled.

I see that you tried and did like the gpg support, but that was added 10
years ago now [0], and we may have been a little bit less trict then.
Now, let's try to be more consistent.

I've done so for all the other compression support and for libcurl, so I
will not reply to each individually to repeat the same thing; consider
they have been handled like this patch.

Applied to master, thanks.

[0] and that was even the commit that separated the hook macro and the
hook assignemnt further apart; I've fixed that now.

Regards,
Yann E. MORIN.

> +OPKG_DEPENDENCIES += zstd
> +OPKG_CONF_OPTS += --enable-zstd
> +else
> +OPKG_CONF_OPTS += --disable-zstd
> +endif
> +
>  OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR
>  
>  $(eval $(autotools-package))
> -- 
> 2.41.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot