Patchwork [bitbake-devel] cooker: Add option of specifying indvidual tasks for targets

login
register
mail settings
Submitter Richard Purdie
Date Jan. 27, 2014, 2:37 p.m.
Message ID <1390833424.17424.251.camel@ted>
Download mbox | patch
Permalink /patch/65883/
State New
Headers show

Comments

Richard Purdie - Jan. 27, 2014, 2:37 p.m.
Currently its near enough impossible to tell bitbake to run target X,
task Y and target A, task B. We could hack various parts of the API
around but it would mean incompatibilities.

An alternative is to accept the syntax "<target>:do_<task>" as a target
name. The default task would be used where the task is unspecified.

This has the advantage that its neat/clean code and works from all
current APIs including the commandline.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Khem Raj - Jan. 27, 2014, 10:39 p.m.
On Mon, Jan 27, 2014 at 6:37 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Currently its near enough impossible to tell bitbake to run target X,
> task Y and target A, task B. We could hack various parts of the API
> around but it would mean incompatibilities.
>
> An alternative is to accept the syntax "<target>:do_<task>" as a target
> name. The default task would be used where the task is unspecified.
>

This should be documented in manuals as well IMO

> This has the advantage that its neat/clean code and works from all
> current APIs including the commandline.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
> index db4cb51..cc7d84e 100644
> --- a/bitbake/lib/bb/cooker.py
> +++ b/bitbake/lib/bb/cooker.py
> @@ -449,9 +449,14 @@ class BBCooker:
>          current = 0
>          runlist = []
>          for k in fulltargetlist:
> +            ktask = task
> +            if ":do_" in k:
> +                k2 = k.split(":do_")
> +                k = k2[0]
> +                ktask = k2[1]
>              taskdata.add_provider(localdata, self.recipecache, k)
>              current += 1
> -            runlist.append([k, "do_%s" % task])
> +            runlist.append([k, "do_%s" % ktask])
>              bb.event.fire(bb.event.TreeDataPreparationProgress(current, len(fulltargetlist)), self.data)
>          taskdata.add_unresolved(localdata, self.recipecache)
>          bb.event.fire(bb.event.TreeDataPreparationCompleted(len(fulltargetlist)), self.data)
>
>
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel
Richard Purdie - Jan. 27, 2014, 10:43 p.m.
On Mon, 2014-01-27 at 14:39 -0800, Khem Raj wrote:
> On Mon, Jan 27, 2014 at 6:37 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > Currently its near enough impossible to tell bitbake to run target X,
> > task Y and target A, task B. We could hack various parts of the API
> > around but it would mean incompatibilities.
> >
> > An alternative is to accept the syntax "<target>:do_<task>" as a target
> > name. The default task would be used where the task is unspecified.
> >
> 
> This should be documented in manuals as well IMO

Totally agreed.

Hi Scott, we need to document this new syntax! ;-)

(I was planning to talk to Scott when I reached the point of merging
this)

Cheers,

Richard

> > This has the advantage that its neat/clean code and works from all
> > current APIs including the commandline.
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
> > index db4cb51..cc7d84e 100644
> > --- a/bitbake/lib/bb/cooker.py
> > +++ b/bitbake/lib/bb/cooker.py
> > @@ -449,9 +449,14 @@ class BBCooker:
> >          current = 0
> >          runlist = []
> >          for k in fulltargetlist:
> > +            ktask = task
> > +            if ":do_" in k:
> > +                k2 = k.split(":do_")
> > +                k = k2[0]
> > +                ktask = k2[1]
> >              taskdata.add_provider(localdata, self.recipecache, k)
> >              current += 1
> > -            runlist.append([k, "do_%s" % task])
> > +            runlist.append([k, "do_%s" % ktask])
> >              bb.event.fire(bb.event.TreeDataPreparationProgress(current, len(fulltargetlist)), self.data)
> >          taskdata.add_unresolved(localdata, self.recipecache)
> >          bb.event.fire(bb.event.TreeDataPreparationCompleted(len(fulltargetlist)), self.data)
> >
> >
> > _______________________________________________
> > bitbake-devel mailing list
> > bitbake-devel@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/bitbake-devel
>

Patch

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index db4cb51..cc7d84e 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -449,9 +449,14 @@  class BBCooker:
         current = 0
         runlist = []
         for k in fulltargetlist:
+            ktask = task
+            if ":do_" in k:
+                k2 = k.split(":do_")
+                k = k2[0]
+                ktask = k2[1]
             taskdata.add_provider(localdata, self.recipecache, k)
             current += 1
-            runlist.append([k, "do_%s" % task])
+            runlist.append([k, "do_%s" % ktask])
             bb.event.fire(bb.event.TreeDataPreparationProgress(current, len(fulltargetlist)), self.data)
         taskdata.add_unresolved(localdata, self.recipecache)
         bb.event.fire(bb.event.TreeDataPreparationCompleted(len(fulltargetlist)), self.data)