[OE-core] [PATCH 1/1] lib/oe/patch.py: Fix applying a directory as a patch

Tomasz Dziendzielski tomasz.dziendzielski at gmail.com
Fri Jan 25 19:55:33 UTC 2019


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 at gmail.com>
---
 meta/lib/oe/patch.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 07a40fc50e..3d0b7d7289 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 None 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:
-- 
2.19.1


More information about the Openembedded-core mailing list