summaryrefslogtreecommitdiffstats
path: root/meta/classes/patch.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/patch.bbclass')
-rw-r--r--meta/classes/patch.bbclass9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 1f6927be04..2c1f58cbdc 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -10,13 +10,13 @@ PATCH_GIT_USER_EMAIL ?= "oe.patch@oe"
10 10
11inherit terminal 11inherit terminal
12 12
13def src_patches(d, all = False ): 13def src_patches(d, all=False, expand=True):
14 workdir = d.getVar('WORKDIR', True) 14 workdir = d.getVar('WORKDIR', True)
15 fetch = bb.fetch2.Fetch([], d) 15 fetch = bb.fetch2.Fetch([], d)
16 patches = [] 16 patches = []
17 sources = [] 17 sources = []
18 for url in fetch.urls: 18 for url in fetch.urls:
19 local = patch_path(url, fetch, workdir) 19 local = patch_path(url, fetch, workdir, expand)
20 if not local: 20 if not local:
21 if all: 21 if all:
22 local = fetch.localpath(url) 22 local = fetch.localpath(url)
@@ -55,13 +55,14 @@ def src_patches(d, all = False ):
55 55
56 return patches 56 return patches
57 57
58def patch_path(url, fetch, workdir): 58def patch_path(url, fetch, workdir, expand=True):
59 """Return the local path of a patch, or None if this isn't a patch""" 59 """Return the local path of a patch, or None if this isn't a patch"""
60 60
61 local = fetch.localpath(url) 61 local = fetch.localpath(url)
62 base, ext = os.path.splitext(os.path.basename(local)) 62 base, ext = os.path.splitext(os.path.basename(local))
63 if ext in ('.gz', '.bz2', '.Z'): 63 if ext in ('.gz', '.bz2', '.Z'):
64 local = os.path.join(workdir, base) 64 if expand:
65 local = os.path.join(workdir, base)
65 ext = os.path.splitext(base)[1] 66 ext = os.path.splitext(base)[1]
66 67
67 urldata = fetch.ud[url] 68 urldata = fetch.ud[url]