diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-02 14:36:56 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-02 14:36:56 +0100 |
commit | e2580df891ded2c92e034d17535ead56487d4df4 (patch) | |
tree | 356b8c18069e528c021612ce6b652634548e8302 | |
parent | d5a137475a69c438f70cc2c422d4eb1e0f2abc7e (diff) | |
download | poky-e2580df891ded2c92e034d17535ead56487d4df4.tar.gz |
patch.bbclass: Fix up the environment for the patch resolution code
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/classes/patch.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass index 2cc1c36792..609e1a1415 100644 --- a/meta/classes/patch.bbclass +++ b/meta/classes/patch.bbclass | |||
@@ -384,8 +384,10 @@ def patch_init(d): | |||
384 | f.close() | 384 | f.close() |
385 | os.chmod(rcfile, 0775) | 385 | os.chmod(rcfile, 0775) |
386 | 386 | ||
387 | bb.utils.build_environment(d) | ||
387 | os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" | 388 | os.environ['TERMWINDOWTITLE'] = "Bitbake: Please fix patch rejects manually" |
388 | os.environ['TERMRCFILE'] = rcfile | 389 | os.environ['TERMRCFILE'] = rcfile |
390 | bb.debug(bb.data.getVar('TERMCMDRUN', d, 1)) | ||
389 | rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1)) | 391 | rc = os.system(bb.data.getVar('TERMCMDRUN', d, 1)) |
390 | if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: | 392 | if os.WIFEXITED(rc) and os.WEXITSTATUS(rc) != 0: |
391 | bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ | 393 | bb.msg.fatal(bb.msg.domain.Build, ("Cannot proceed with manual patch resolution - '%s' not found. " \ |