diff options
| author | Chris Larson <kergoth@openedhand.com> | 2006-07-21 08:56:29 +0000 |
|---|---|---|
| committer | Chris Larson <kergoth@openedhand.com> | 2006-07-21 08:56:29 +0000 |
| commit | 37764d23d0ca36ed6eb85506a2b593f4a18a0b7c (patch) | |
| tree | 51ca92d42ad4a2bc1a71af71567dae662576caf0 /openembedded | |
| parent | 1b95f50498de4081fc18ba588f0073b344bb3c73 (diff) | |
| download | openembedded-core-37764d23d0ca36ed6eb85506a2b593f4a18a0b7c.tar.gz openembedded-core-37764d23d0ca36ed6eb85506a2b593f4a18a0b7c.tar.bz2 openembedded-core-37764d23d0ca36ed6eb85506a2b593f4a18a0b7c.zip | |
Bugfix in OEs base.bbclass: files in SRC_URI which reside in WORKDIR resulted in a failure. With this bug fixed, patches within tarballs can be successfully applied to ${S}.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@526 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
| -rw-r--r-- | openembedded/classes/base.bbclass | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/openembedded/classes/base.bbclass b/openembedded/classes/base.bbclass index 08253433e3..8467ebddc2 100644 --- a/openembedded/classes/base.bbclass +++ b/openembedded/classes/base.bbclass @@ -400,6 +400,13 @@ def oe_unpack_file(file, data, url = None): cmd = 'cp %s %s/%s/' % (file, os.getcwd(), destdir) if not cmd: return True + + + dest = os.path.join(os.getcwd(), os.path.basename(file)) + if os.path.exists(dest): + if os.path.samefile(file, dest): + return True + cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd) bb.note("Unpacking %s to %s/" % (file, os.getcwd())) ret = os.system(cmd) |