diff options
| author |   Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> | 2019-01-25 20:55:33 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-26 13:38:59 +0000 |
| commit | 1e38d74a2ca7638b1f54e2bb5617903c2683e484 (patch) | |
| tree | 79899e8dcfa2cca6f8c1922a0d04ea428e3ed360 /meta/lib | |
| parent | cc4a75c7ebf24fb3b7b35552a090e8844985e45e (diff) | |
| download | openembedded-core-contrib-1e38d74a2ca7638b1f54e2bb5617903c2683e484.tar.gz | |
lib/oe/patch.py: Fix applying a directory as a patch
If a SRC_URI content ends with '.patch' bitbake is
trying to apply it as it's a patch file.
It causes that if we use git repository for 'patch' package
the bare clone is extracted to a directory
(i.e. build/downloads/git2/git.mirror.org.patch/) which is considered
to be a patch file, so patch.py tries to apply that directory as a patch
which ends up with a failure.
Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/patch.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 8c8e96a2dc..7dd31d9d46 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -793,6 +793,8 @@ def patch_path(url, fetch, workdir, expand=True): """Return the local path of a patch, or return nothing if this isn't a patch""" local = fetch.localpath(url) + if os.path.isdir(local): + return base, ext = os.path.splitext(os.path.basename(local)) if ext in ('.gz', '.bz2', '.xz', '.Z'): if expand: |