summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-04-27 10:53:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-27 15:05:52 +0100
commitf1f9fab266503eb81aa624b98b8577e5fe3ad5b6 (patch)
tree7620364f9f825d6d58dd0b2c98d96715e1689d0e
parentca1f4d7279417cbfb1966c27311a5e39d571d742 (diff)
downloadpoky-f1f9fab266503eb81aa624b98b8577e5fe3ad5b6.tar.gz
devtool: handle . in recipe name
Names such as glib-2.0 are valid (and used) recipe names, so we need to support them. Fixes [YOCTO #7643]. (From OE-Core rev: b9fd8d4d4dfae72de2e81e9b14de072e12cecdcf) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/recipeutils.py4
-rwxr-xr-xscripts/devtool2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index 09bd7fdb46..19d97b62d2 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -269,8 +269,8 @@ def get_recipe_patches(d):
269def validate_pn(pn): 269def validate_pn(pn):
270 """Perform validation on a recipe name (PN) for a new recipe.""" 270 """Perform validation on a recipe name (PN) for a new recipe."""
271 reserved_names = ['forcevariable', 'append', 'prepend', 'remove'] 271 reserved_names = ['forcevariable', 'append', 'prepend', 'remove']
272 if not re.match('[0-9a-z-]+', pn): 272 if not re.match('[0-9a-z-.]+', pn):
273 return 'Recipe name "%s" is invalid: only characters 0-9, a-z and - are allowed' % pn 273 return 'Recipe name "%s" is invalid: only characters 0-9, a-z, - and . are allowed' % pn
274 elif pn in reserved_names: 274 elif pn in reserved_names:
275 return 'Recipe name "%s" is invalid: is a reserved keyword' % pn 275 return 'Recipe name "%s" is invalid: is a reserved keyword' % pn
276 elif pn.startswith('pn-'): 276 elif pn.startswith('pn-'):
diff --git a/scripts/devtool b/scripts/devtool
index 981ff515d3..841831c410 100755
--- a/scripts/devtool
+++ b/scripts/devtool
@@ -101,7 +101,7 @@ def read_workspace():
101 _create_workspace(config.workspace_path, config, basepath) 101 _create_workspace(config.workspace_path, config, basepath)
102 102
103 logger.debug('Reading workspace in %s' % config.workspace_path) 103 logger.debug('Reading workspace in %s' % config.workspace_path)
104 externalsrc_re = re.compile(r'^EXTERNALSRC(_pn-[a-zA-Z0-9-]*)? =.*$') 104 externalsrc_re = re.compile(r'^EXTERNALSRC(_pn-[^ =]+)? =.*$')
105 for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')): 105 for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')):
106 pn = os.path.splitext(os.path.basename(fn))[0].split('_')[0] 106 pn = os.path.splitext(os.path.basename(fn))[0].split('_')[0]
107 with open(fn, 'r') as f: 107 with open(fn, 'r') as f: