Skip to contentSkip to conversation

kernel-yocto: export GUILT_BASE

PATCH In review Bruce Ashfield 3 participants 7 messages May 8, 2012 – May 9, 2012

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover kernel-yocto: export GUILT_BASE

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(-)
author
#1 lore raw

PATCH 1/1 kernel-yocto: export GUILT_BASE

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 <[email protected]>
---
 meta/classes/kernel-yocto.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
meta/classes/kernel-yocto.bbclass +6 -0
index c6425b2..fb9dce1 100644
@@ -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)
+}
+
Signature · 1 line
1.7.0.4
#2 lore raw
In reply to Bruce Ashfield
Quoted 11 lines · 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.

Can't you just set:

GUILT_BASE = "meta"

?

Cheers,

Richard

#3 lore raw
Quoted 11 lines · Richard Purdie
Quoted 10 lines · 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.

Quoted 5 lines
Quoted 1 line

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

Quoted 12 lines

?

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#4 lore raw
Quoted 15 lines · Bruce Ashfield
Quoted 13 lines · Richard Purdie
Quoted 11 lines · 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.

Quoted 7 lines
Quoted 3 lines

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

Quoted 21 lines

Bruce

Quoted 5 lines

?

Cheers,

Quoted 7 lines

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
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"

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"
#5 lore raw
Quoted 24 lines · Bruce Ashfield
Quoted 15 lines · Bruce Ashfield
Quoted 13 lines · Richard Purdie
Quoted 11 lines · 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.

Quoted 7 lines
Quoted 3 lines

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 :)

Quoted 7 lines

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

#6 lore raw
Quoted 30 lines · Richard Purdie
Quoted 29 lines · Bruce Ashfield
Quoted 15 lines · Bruce Ashfield
Quoted 13 lines · Richard Purdie
Quoted 11 lines · 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.

Quoted 7 lines
Quoted 3 lines

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

Quoted 7 lines
Quoted 2 lines

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

Quoted 14 lines

work?

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

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Signature · 2 lines
"Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end"