summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/lib/checklayer/__init__.py8
-rw-r--r--scripts/lib/devtool/deploy.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/scripts/lib/checklayer/__init__.py b/scripts/lib/checklayer/__init__.py
index 6c2b86a79a..63952616ba 100644
--- a/scripts/lib/checklayer/__init__.py
+++ b/scripts/lib/checklayer/__init__.py
@@ -46,16 +46,16 @@ def _get_layer_collections(layer_path, lconf=None, data=None):
46 raise LayerError(exc) 46 raise LayerError(exc)
47 ldata.expandVarref('LAYERDIR') 47 ldata.expandVarref('LAYERDIR')
48 48
49 collections = (ldata.getVar('BBFILE_COLLECTIONS', True) or '').split() 49 collections = (ldata.getVar('BBFILE_COLLECTIONS') or '').split()
50 if not collections: 50 if not collections:
51 name = os.path.basename(layer_path) 51 name = os.path.basename(layer_path)
52 collections = [name] 52 collections = [name]
53 53
54 collections = {c: {} for c in collections} 54 collections = {c: {} for c in collections}
55 for name in collections: 55 for name in collections:
56 priority = ldata.getVar('BBFILE_PRIORITY_%s' % name, True) 56 priority = ldata.getVar('BBFILE_PRIORITY_%s' % name)
57 pattern = ldata.getVar('BBFILE_PATTERN_%s' % name, True) 57 pattern = ldata.getVar('BBFILE_PATTERN_%s' % name)
58 depends = ldata.getVar('LAYERDEPENDS_%s' % name, True) 58 depends = ldata.getVar('LAYERDEPENDS_%s' % name)
59 collections[name]['priority'] = priority 59 collections[name]['priority'] = priority
60 collections[name]['pattern'] = pattern 60 collections[name]['pattern'] = pattern
61 collections[name]['depends'] = depends 61 collections[name]['depends'] = depends
diff --git a/scripts/lib/devtool/deploy.py b/scripts/lib/devtool/deploy.py
index 7c571746c8..9cc492788b 100644
--- a/scripts/lib/devtool/deploy.py
+++ b/scripts/lib/devtool/deploy.py
@@ -178,13 +178,13 @@ def deploy(args, config, basepath, workspace):
178 if args.strip and not args.dry_run: 178 if args.strip and not args.dry_run:
179 # Fakeroot copy to new destination 179 # Fakeroot copy to new destination
180 srcdir = recipe_outdir 180 srcdir = recipe_outdir
181 recipe_outdir = os.path.join(rd.getVar('WORKDIR', True), 'deploy-target-stripped') 181 recipe_outdir = os.path.join(rd.getVar('WORKDIR'), 'deploy-target-stripped')
182 if os.path.isdir(recipe_outdir): 182 if os.path.isdir(recipe_outdir):
183 bb.utils.remove(recipe_outdir, True) 183 bb.utils.remove(recipe_outdir, True)
184 exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True) 184 exec_fakeroot(rd, "cp -af %s %s" % (os.path.join(srcdir, '.'), recipe_outdir), shell=True)
185 os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH', True) or '']) 185 os.environ['PATH'] = ':'.join([os.environ['PATH'], rd.getVar('PATH') or ''])
186 oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP', True), rd.getVar('libdir', True), 186 oe.package.strip_execs(args.recipename, recipe_outdir, rd.getVar('STRIP'), rd.getVar('libdir'),
187 rd.getVar('base_libdir', True)) 187 rd.getVar('base_libdir'))
188 188
189 filelist = [] 189 filelist = []
190 ftotalsize = 0 190 ftotalsize = 0