mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-01-12 03:24:08 +00:00
contrib: allow override-style syntax for vars & routines
Currently, the variable and routine regexes don't support the override-style syntax. This means we may break routine blocks, as we don't recognise overridden routines with an :append/:prepend/etc. This change adds the ":" char to the var & routine regexes. Signed-off-by: Jeremy Kerr <jk@codeconstruct.com.au> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -210,8 +210,8 @@ OE_vars = [
|
||||
'others'
|
||||
]
|
||||
|
||||
varRegexp = r'^([a-zA-Z_0-9${}-]*)([ \t]*)([+.:]?=[+.]?)([ \t]*)([^\t]+)'
|
||||
routineRegexp = r'^([a-zA-Z0-9_ ${}-]+?)\('
|
||||
varRegexp = r'^([a-zA-Z_0-9${}:-]*)([ \t]*)([+.:]?=[+.]?)([ \t]*)([^\t]+)'
|
||||
routineRegexp = r'^([a-zA-Z0-9_ ${}:-]+?)\('
|
||||
|
||||
# Variables seen in the processed .bb
|
||||
seen_vars = {}
|
||||
|
||||
Reference in New Issue
Block a user