diff options
Diffstat (limited to 'scripts/devtool')
-rwxr-xr-x | scripts/devtool | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/devtool b/scripts/devtool index 5292f187e5..87bb5c8323 100755 --- a/scripts/devtool +++ b/scripts/devtool | |||
@@ -113,6 +113,7 @@ def read_workspace(): | |||
113 | externalsrc_re = re.compile(r'^EXTERNALSRC(_pn-([^ =]+))? *= *"([^"]*)"$') | 113 | externalsrc_re = re.compile(r'^EXTERNALSRC(_pn-([^ =]+))? *= *"([^"]*)"$') |
114 | for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')): | 114 | for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')): |
115 | with open(fn, 'r') as f: | 115 | with open(fn, 'r') as f: |
116 | pnvalues = {} | ||
116 | for line in f: | 117 | for line in f: |
117 | res = externalsrc_re.match(line.rstrip()) | 118 | res = externalsrc_re.match(line.rstrip()) |
118 | if res: | 119 | if res: |
@@ -125,10 +126,16 @@ def read_workspace(): | |||
125 | bbfile)) | 126 | bbfile)) |
126 | if recipefile: | 127 | if recipefile: |
127 | recipefile = recipefile[0] | 128 | recipefile = recipefile[0] |
128 | workspace[pn] = {'srctree': res.group(3), | 129 | pnvalues['srctree'] = res.group(3) |
129 | 'bbappend': fn, | 130 | pnvalues['bbappend'] = fn |
130 | 'recipefile': recipefile} | 131 | pnvalues['recipefile'] = recipefile |
131 | logger.debug('Found recipe %s' % workspace[pn]) | 132 | elif line.startswith('# srctreebase: '): |
133 | pnvalues['srctreebase'] = line.split(':', 1)[1].strip() | ||
134 | if pnvalues: | ||
135 | if not pnvalues.get('srctreebase', None): | ||
136 | pnvalues['srctreebase'] = pnvalues['srctree'] | ||
137 | logger.debug('Found recipe %s' % pnvalues) | ||
138 | workspace[pn] = pnvalues | ||
132 | 139 | ||
133 | def create_workspace(args, config, basepath, workspace): | 140 | def create_workspace(args, config, basepath, workspace): |
134 | if args.layerpath: | 141 | if args.layerpath: |