[meta-networking][PATCH] waf-samba: skip waf_preconfigure() prefunc from waf.bbclass

[meta-networking][PATCH] waf-samba: skip waf_preconfigure() prefunc from waf.bbclass

[Kyle Russell]

waf_preconfigure() fails in samba packages because wafbin is packaged
differently, and we already pass bindir and libdir through
CONFIGUREOPTS.

Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
---
 meta-networking/classes/waf-samba.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass
index e490176..94ecf4a 100644
--- a/meta-networking/classes/waf-samba.bbclass
+++ b/meta-networking/classes/waf-samba.bbclass
@@ -42,6 +42,7 @@ CONFIGUREOPTS = " --prefix=${prefix} \
 # to help generate the cross answer when adding new board support.
 CROSS_METHOD ?= "answer"
 
+do_configure[prefuncs] = ""
 do_configure() {
 
     # Prepare the cross-answers file
-- 
2.7.4

Re: [meta-networking][PATCH] waf-samba: skip waf_preconfigure() prefunc from waf.bbclass

[Joshua Watt]

On Sat, Feb 10, 2018 at 9:39 AM, Kyle Russell <bkylerussell@gmail.com> wrote:
> waf_preconfigure() fails in samba packages because wafbin is packaged
> differently, and we already pass bindir and libdir through
> CONFIGUREOPTS.
>
> Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
> ---
>  meta-networking/classes/waf-samba.bbclass | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/meta-networking/classes/waf-samba.bbclass b/meta-networking/classes/waf-samba.bbclass
> index e490176..94ecf4a 100644
> --- a/meta-networking/classes/waf-samba.bbclass
> +++ b/meta-networking/classes/waf-samba.bbclass
> @@ -42,6 +42,7 @@ CONFIGUREOPTS = " --prefix=${prefix} \
>  # to help generate the cross answer when adding new board support.
>  CROSS_METHOD ?= "answer"
>
> +do_configure[prefuncs] = ""

Hmm, I'm not sure we want to unconditionally remove all prefuncs.

This breaking samba was brought up to me (since I wrote the patch that
broke samba), and I actually think a better approach would be to make
waf-samba no longer inherit from waf.bbclass. The samba method of
using waf is so different from a "standard" waf usage, that the
inheritance doesn't really make sense IHMO. I'm preparing a patch to
do this, and it appears that the only two things that
waf-samba.bbclass actually needs from waf.bbclass are
get_waf_parallel_make() and DISABLE_STATIC = "", neither of which it
can't implement itself.

>  do_configure() {
>
>      # Prepare the cross-answers file
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-networking][PATCH] waf-samba: skip waf_preconfigure() prefunc from waf.bbclass

[Kyle Russell]

That seems reasonable to me.  I didn't really like how this change
implicitly depended on the base waf class setup either, but I wasn't sure
if the breakage was on anyone's radar.  I'll try out your other patch
tomorrow.

Thanks!

On Sun, Feb 11, 2018 at 4:30 PM, Joshua Watt <jpewhacker@gmail.com> wrote:

> On Sat, Feb 10, 2018 at 9:39 AM, Kyle Russell <bkylerussell@gmail.com>
> wrote:
> > waf_preconfigure() fails in samba packages because wafbin is packaged
> > differently, and we already pass bindir and libdir through
> > CONFIGUREOPTS.
> >
> > Signed-off-by: Kyle Russell <bkylerussell@gmail.com>
> > ---
> >  meta-networking/classes/waf-samba.bbclass | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/meta-networking/classes/waf-samba.bbclass
> b/meta-networking/classes/waf-samba.bbclass
> > index e490176..94ecf4a 100644
> > --- a/meta-networking/classes/waf-samba.bbclass
> > +++ b/meta-networking/classes/waf-samba.bbclass
> > @@ -42,6 +42,7 @@ CONFIGUREOPTS = " --prefix=${prefix} \
> >  # to help generate the cross answer when adding new board support.
> >  CROSS_METHOD ?= "answer"
> >
> > +do_configure[prefuncs] = ""
>
> Hmm, I'm not sure we want to unconditionally remove all prefuncs.
>
> This breaking samba was brought up to me (since I wrote the patch that
> broke samba), and I actually think a better approach would be to make
> waf-samba no longer inherit from waf.bbclass. The samba method of
> using waf is so different from a "standard" waf usage, that the
> inheritance doesn't really make sense IHMO. I'm preparing a patch to
> do this, and it appears that the only two things that
> waf-samba.bbclass actually needs from waf.bbclass are
> get_waf_parallel_make() and DISABLE_STATIC = "", neither of which it
> can't implement itself.
>
> >  do_configure() {
> >
> >      # Prepare the cross-answers file
> > --
> > 2.7.4
> >
> > --
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>