Re: [Buildroot] [PATCH v1 8/8] package/openssl: move libopenssl/libressl source statemetns outside of the choice

[Peter Seiderer via buildroot <buildroot@buildroot.org>]

Hello Yann,

On Mon, 6 May 2024 22:11:14 +0200, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:

> > https://lists.buildroot.org/mailman/listinfo/buildroot
>
> Peter, All,
>
> On 2024-05-06 16:45 +0200, Peter Seiderer via buildroot spake thusly:
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> > Notes/ToDo:
> > - with this solution the external support needs to be splitted into
> >   two imports/lines...
>
> NMot sure I understand wht you meant here...

Short/compressed note (and not clear), but see below...

>
> > ---
> >  package/openssl/Config.in | 7 +++----
> >  1 file changed, 3 insertions(+), 4 deletions(-)
> >
> > diff --git a/package/openssl/Config.in b/package/openssl/Config.in
> > index 3d14988d99..fcf996f03f 100644
> > --- a/package/openssl/Config.in
> > +++ b/package/openssl/Config.in
> > @@ -28,8 +28,6 @@ config BR2_PACKAGE_LIBOPENSSL
> >
> >  	  Note: Some helper scripts need perl.
> >
> > -source "package/libopenssl/Config.in"
> > -
> >  config BR2_PACKAGE_LIBRESSL
> >  	bool "libressl"
> >  	depends on !BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
> > @@ -44,13 +42,14 @@ config BR2_PACKAGE_LIBRESSL
> >
> >  	  http://www.libressl.org/
> >
> > -source "package/libressl/Config.in"
> > -
> >  # openssl from br2-external trees, if any
> >  source "$(BASE_DIR)/.br2-external.in.openssl"
>
> This leaves one 'source' statement in te choice, which is no longer
> accepted, AFAIU.

'source' is accepted here, but not with all possible content...

>
> >  endchoice
> >
> > +source "package/libopenssl/Config.in"
> > +source "package/libressl/Config.in"
>
> I think the best solution is to move the if-endif conditional block out
> of package/libopenssl/Config.in back into package/openssl/Config.in, and
> add a new choice entry, so that basically we end up with something lie;
>
>     choice
>         bool "ssl library"
>
>     config BR2_PACKAGE_LIBOPENSSL
>         bool "openssl"
>
>     config BR2_PACKAGE_LIBRESSL
>         bool "libressl"
>
>     config BR2_PACKAGE_OPENSSL_EXTERNAL
>         bool "from an external tree"
>         depends on $BR2_EXTERNAL != ""  # Or something along those lines, adapt
>
>     endchoice
>
>     if BR2_PACKAGE_LIBOPENSSL
>     source "package/libopenssl/Config.in"
>     endif
>
>     if BR2_PACKAGE_LIBRESSL
>     source "package/libressl/Config.in"
>     endif
>
>     if BR2_PACKAGE_OPENSSL_EXTERNAL
>     source "$(BASE_DIR)/.br2-external.in.openssl"
>     endif

Will test the proposed solution the next days..., alternative solution would be:

     choice
         bool "ssl library"

     config BR2_PACKAGE_LIBOPENSSL
         bool "openssl"

     config BR2_PACKAGE_LIBRESSL
         bool "libressl"

     source "$(BASE_DIR)/.br2-external.in.openssl-choice"

     endchoice

     source "package/libopenssl/Config.in"
     source "package/libressl/Config.in"
     source "$(BASE_DIR)/.br2-external.in.openssl"

Splitting the external content into two files (two lines), keeping the 'source'
of the empty files as default (the first with the choice content, the second
with the regarding configuration entries)...

But either way the content of '.br2-external.in.openssl' needs to be
changed/adjusted...

Regards,
Peter


>
> Basically, that would make for an uglier state, but that's the best we
> can do given the new limitsations introduced by upstream kconfig...
>
> Thoughts?
>
> Regards,
> Yann E. MORIN.
>
> >  config BR2_PACKAGE_HAS_OPENSSL
> >  	bool
> >
> > --
> > 2.44.0
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot@buildroot.org
> > https://lists.buildroot.org/mailman/listinfo/buildroot
>

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