[OE-core] [PATCH 1/2] Rework how the devshell functions

Chris Larson clarson at kergoth.com
Wed Jul 13 19:45:04 UTC 2011


On Wed, Jul 13, 2011 at 12:36 PM, Richard Purdie
<richard.purdie at linuxfoundation.org> wrote:
> On Wed, 2011-07-13 at 11:35 -0700, Christopher Larson wrote:
>> diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
>> index 5f262f4..95c29f3 100644
>> --- a/meta/classes/devshell.bbclass
>> +++ b/meta/classes/devshell.bbclass
>> @@ -1,22 +1,17 @@
>> -do_devshell[dirs] = "${S}"
>> -do_devshell[nostamp] = "1"
>> +inherit terminal
>>
>> -XAUTHORITY ?= "${HOME}/.Xauthority"
>>
>> -devshell_do_devshell() {
>> -     export DISPLAY='${DISPLAY}'
>> -     export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
>> -     export XAUTHORITY='${XAUTHORITY}'
>> -     export TERMWINDOWTITLE="Bitbake Developer Shell"
>> -     export EXTRA_OEMAKE='${EXTRA_OEMAKE}'
>> -     export SHELLCMDS="bash"
>> -     ${TERMCMDRUN}
>> -     if [ $? -ne 0 ]; then
>> -         echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
>> -         exit 1
>> -     fi
>> +export XAUTHORITY ?= "${HOME}/.Xauthority"
>> +export SHELL ?= "bash"
>> +export DBUS_SESSION_BUS_ADDRESS
>> +export DISPLAY
>> +export EXTRA_OEMAKE
>
> Variables that are placed into the global environment affect the
> checksums of any shell tasks when they change so I don't think we can do
> this (and its why they are in a function as above).
>
> Perhaps we could list the variables we want to export in a variable and
> then pass that list to popen's environment?

Hmm, fair enough, I'll rework it that way (aside: we really need a
general flag-based mechanism to do per-task exports).
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics




More information about the Openembedded-core mailing list