From 1e38d74a2ca7638b1f54e2bb5617903c2683e484 Mon Sep 17 00:00:00 2001 From: Tomasz Dziendzielski Date: Fri, 25 Jan 2019 20:55:33 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/lib/oe/patch.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta') 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: -- cgit 1.2.3-korg