diff options
-rw-r--r-- | scripts/lib/recipetool/append.py | 6 | ||||
-rwxr-xr-x | scripts/verify-bashisms | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index def4f9027c..69c8bb77a0 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py | |||
@@ -121,7 +121,7 @@ def determine_file_source(targetpath, rd): | |||
121 | logger.debug('source path: %s' % srcpath) | 121 | logger.debug('source path: %s' % srcpath) |
122 | if not srcpath.startswith('/'): | 122 | if not srcpath.startswith('/'): |
123 | # Handle non-absolute path | 123 | # Handle non-absolute path |
124 | srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs', True).split()[-1], srcpath)) | 124 | srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs').split()[-1], srcpath)) |
125 | if srcpath.startswith(workdir): | 125 | if srcpath.startswith(workdir): |
126 | # OK, now we have the source file name, look for it in SRC_URI | 126 | # OK, now we have the source file name, look for it in SRC_URI |
127 | workdirfile = os.path.relpath(srcpath, workdir) | 127 | workdirfile = os.path.relpath(srcpath, workdir) |
@@ -191,10 +191,10 @@ def get_source_path(cmdelements): | |||
191 | def get_func_deps(func, d): | 191 | def get_func_deps(func, d): |
192 | """Find the function dependencies of a shell function""" | 192 | """Find the function dependencies of a shell function""" |
193 | deps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func)) | 193 | deps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func)) |
194 | deps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) | 194 | deps |= set((d.getVarFlag(func, "vardeps") or "").split()) |
195 | funcdeps = [] | 195 | funcdeps = [] |
196 | for dep in deps: | 196 | for dep in deps: |
197 | if d.getVarFlag(dep, 'func', True): | 197 | if d.getVarFlag(dep, 'func'): |
198 | funcdeps.append(dep) | 198 | funcdeps.append(dep) |
199 | return funcdeps | 199 | return funcdeps |
200 | 200 | ||
diff --git a/scripts/verify-bashisms b/scripts/verify-bashisms index 0741e18447..a8f761d4c5 100755 --- a/scripts/verify-bashisms +++ b/scripts/verify-bashisms | |||
@@ -97,7 +97,7 @@ if __name__=='__main__': | |||
97 | result = [] | 97 | result = [] |
98 | data = tinfoil.parse_recipe_file(fn) | 98 | data = tinfoil.parse_recipe_file(fn) |
99 | for key in data.keys(): | 99 | for key in data.keys(): |
100 | if data.getVarFlag(key, "func", True) and not data.getVarFlag(key, "python", True): | 100 | if data.getVarFlag(key, "func") and not data.getVarFlag(key, "python"): |
101 | script = data.getVar(key, False) | 101 | script = data.getVar(key, False) |
102 | if not script: continue | 102 | if not script: continue |
103 | #print ("%s:%s" % (fn, key)) | 103 | #print ("%s:%s" % (fn, key)) |