[PATCH 0/1] kernel-yocto: export GUILT_BASE

[PATCH 0/1] kernel-yocto: export GUILT_BASE

[Bruce Ashfield]

Richard/Saul,

As Frans Meulenbroeks noted this morning, guilt wasn't functional
in the devshell. The fix was simple enough, and by ensuring that
GUILT_BASE is exported, it works without any extra steps now.

I wasn't sure if there a better way to call 'up' to the base
method, so I repeated the call to oe_terminal in the do_devshell()
in kernel-yocto.bbclass.

If there's another approach, let me know and I'll respin the patch.

Cheers,

Bruce

The following changes since commit b1867950831ab6edb00b819f4cde81d40007f22e:
  Bruce Ashfield (1):
        meta-yocto/linux-yocto-3.0: update branch mappings for new tools

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (1):
  kernel-yocto: export GUILT_BASE

 meta/classes/kernel-yocto.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

[PATCH 1/1] kernel-yocto: export GUILT_BASE

[Bruce Ashfield]

One of the patch backends to linux-yocto is guilt, which normally
tracks patches under .git. But .git isn't something that can be
checked into a SCM and repeated. So it has been moved under meta/patches
and committed to the meta branch.

If devshell is used, GUILT_BASE isn't set, so patch manipulations will
fail. We export GUILT_BASE and point it at the meta directory when
devshell is invoked for linux-yocto.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index c6425b2..fb9dce1 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -290,4 +290,10 @@ do_kernel_link_vmlinux() {
 	ln -sf ../../../vmlinux
 }
 
+OE_TERMINAL_EXPORTS += "GUILT_BASE"
+python do_devshell () {
+    d.setVar("GUILT_BASE", "meta")
+    oe_terminal( d.getVar('SHELL', True), 'OpenEmbedded Developer Shell', d)
+}
+
 
-- 
1.7.0.4

Re: [PATCH 0/1] kernel-yocto: export GUILT_BASE

[Richard Purdie]

On Tue, 2012-05-08 at 15:23 -0400, Bruce Ashfield wrote:
> Richard/Saul,
> 
> As Frans Meulenbroeks noted this morning, guilt wasn't functional
> in the devshell. The fix was simple enough, and by ensuring that
> GUILT_BASE is exported, it works without any extra steps now.
> 
> I wasn't sure if there a better way to call 'up' to the base
> method, so I repeated the call to oe_terminal in the do_devshell()
> in kernel-yocto.bbclass.
> 
> If there's another approach, let me know and I'll respin the patch.

Can't you just set:

GUILT_BASE = "meta"

?

Cheers,

Richard

Re: [PATCH 0/1] kernel-yocto: export GUILT_BASE

[Bruce Ashfield]

On Wed, May 9, 2012 at 2:51 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Tue, 2012-05-08 at 15:23 -0400, Bruce Ashfield wrote:
>> Richard/Saul,
>>
>> As Frans Meulenbroeks noted this morning, guilt wasn't functional
>> in the devshell. The fix was simple enough, and by ensuring that
>> GUILT_BASE is exported, it works without any extra steps now.
>>
>> I wasn't sure if there a better way to call 'up' to the base
>> method, so I repeated the call to oe_terminal in the do_devshell()
>> in kernel-yocto.bbclass.
>>
>> If there's another approach, let me know and I'll respin the patch.
>
> Can't you just set:
>
> GUILT_BASE = "meta"

Will that export to the subshell ? I didn't try it .. since I didn't
think it would.
I'll give that a go here :)

Bruce

>
> ?
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Re: [PATCH 0/1] kernel-yocto: export GUILT_BASE

[Bruce Ashfield]

On Wed, May 9, 2012 at 8:42 AM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> On Wed, May 9, 2012 at 2:51 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> On Tue, 2012-05-08 at 15:23 -0400, Bruce Ashfield wrote:
>>> Richard/Saul,
>>>
>>> As Frans Meulenbroeks noted this morning, guilt wasn't functional
>>> in the devshell. The fix was simple enough, and by ensuring that
>>> GUILT_BASE is exported, it works without any extra steps now.
>>>
>>> I wasn't sure if there a better way to call 'up' to the base
>>> method, so I repeated the call to oe_terminal in the do_devshell()
>>> in kernel-yocto.bbclass.
>>>
>>> If there's another approach, let me know and I'll respin the patch.
>>
>> Can't you just set:
>>
>> GUILT_BASE = "meta"
>
> Will that export to the subshell ? I didn't try it .. since I didn't
> think it would.
> I'll give that a go here :)

With just that set in kernel-yocto.bbclass, and I launch devshell, I get this:

% guilt applied
Patches directory doesn't exist, try guilt-init

So unless I misunderstood what you are suggesting, I still need that explicit
export.

Cheers,

Bruce


>
> Bruce
>
>>
>> ?
>>
>> Cheers,
>>
>> Richard
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"

Re: [PATCH 0/1] kernel-yocto: export GUILT_BASE

[Richard Purdie]

On Wed, 2012-05-09 at 09:08 -0400, Bruce Ashfield wrote:
> On Wed, May 9, 2012 at 8:42 AM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
> > On Wed, May 9, 2012 at 2:51 AM, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> >> On Tue, 2012-05-08 at 15:23 -0400, Bruce Ashfield wrote:
> >>> Richard/Saul,
> >>>
> >>> As Frans Meulenbroeks noted this morning, guilt wasn't functional
> >>> in the devshell. The fix was simple enough, and by ensuring that
> >>> GUILT_BASE is exported, it works without any extra steps now.
> >>>
> >>> I wasn't sure if there a better way to call 'up' to the base
> >>> method, so I repeated the call to oe_terminal in the do_devshell()
> >>> in kernel-yocto.bbclass.
> >>>
> >>> If there's another approach, let me know and I'll respin the patch.
> >>
> >> Can't you just set:
> >>
> >> GUILT_BASE = "meta"
> >
> > Will that export to the subshell ? I didn't try it .. since I didn't
> > think it would.
> > I'll give that a go here :)
> 
> With just that set in kernel-yocto.bbclass, and I launch devshell, I get this:
> 
> % guilt applied
> Patches directory doesn't exist, try guilt-init
> 
> So unless I misunderstood what you are suggesting, I still need that explicit
> export.

Sorry, let me be more clear. I meant does:

OE_TERMINAL_EXPORTS += "GUILT_BASE"
GUILT_BASE = "meta"

work?

I'm not sure we need everything in the original patch...

Cheers,

Richard

Re: [PATCH 0/1] kernel-yocto: export GUILT_BASE

[Bruce Ashfield]

On Wed, May 9, 2012 at 4:04 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Wed, 2012-05-09 at 09:08 -0400, Bruce Ashfield wrote:
>> On Wed, May 9, 2012 at 8:42 AM, Bruce Ashfield <bruce.ashfield@gmail.com> wrote:
>> > On Wed, May 9, 2012 at 2:51 AM, Richard Purdie
>> > <richard.purdie@linuxfoundation.org> wrote:
>> >> On Tue, 2012-05-08 at 15:23 -0400, Bruce Ashfield wrote:
>> >>> Richard/Saul,
>> >>>
>> >>> As Frans Meulenbroeks noted this morning, guilt wasn't functional
>> >>> in the devshell. The fix was simple enough, and by ensuring that
>> >>> GUILT_BASE is exported, it works without any extra steps now.
>> >>>
>> >>> I wasn't sure if there a better way to call 'up' to the base
>> >>> method, so I repeated the call to oe_terminal in the do_devshell()
>> >>> in kernel-yocto.bbclass.
>> >>>
>> >>> If there's another approach, let me know and I'll respin the patch.
>> >>
>> >> Can't you just set:
>> >>
>> >> GUILT_BASE = "meta"
>> >
>> > Will that export to the subshell ? I didn't try it .. since I didn't
>> > think it would.
>> > I'll give that a go here :)
>>
>> With just that set in kernel-yocto.bbclass, and I launch devshell, I get this:
>>
>> % guilt applied
>> Patches directory doesn't exist, try guilt-init
>>
>> So unless I misunderstood what you are suggesting, I still need that explicit
>> export.
>
> Sorry, let me be more clear. I meant does:
>
> OE_TERMINAL_EXPORTS += "GUILT_BASE"
> GUILT_BASE = "meta"

Aha. Yes. That does work, since the setVar does that same thing :)

I can drop my devshell override and it works. I'll update my patch and push it
back to the branch in the pull request.

Bruce

>
> work?
>
> I'm not sure we need everything in the original patch...
>
> Cheers,
>
> Richard
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core



-- 
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"