summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-08-04 16:24:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-05 08:53:40 +0100
commit1c240f920907518c8982d3164205fa13e6c04f84 (patch)
tree2cd8844e6d2d9aebfeecbe843d84b26f18e051ca /scripts
parent0b3be2821d740b9109c7b70cb7123764d80ef37b (diff)
downloadpoky-1c240f920907518c8982d3164205fa13e6c04f84.tar.gz
convert-overrides.py: allow dots before override in vars_re and shortvars_re
e.g. VIRTUAL-RUNTIME_com.webos.service.flowmanager_armv4 weren't replaced with VIRTUAL-RUNTIME_com.webos.service.flowmanager:armv4 or when package name contains a dot like in: RDEPENDS:gstreamer1.0-meta-base:remove (From OE-Core rev: 41bff44bd26c09573eb3139bb6735e5ecfda18b7) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/contrib/convert-overrides.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/contrib/convert-overrides.py b/scripts/contrib/convert-overrides.py
index 8cdcf208bc..e4a310d1d6 100755
--- a/scripts/contrib/convert-overrides.py
+++ b/scripts/contrib/convert-overrides.py
@@ -69,11 +69,11 @@ packagevars = packagevars + imagevars
69 69
70vars_re = {} 70vars_re = {}
71for exp in vars: 71for exp in vars:
72 vars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}]+)_' + exp), r"\1:" + exp) 72 vars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp), r"\1:" + exp)
73 73
74shortvars_re = {} 74shortvars_re = {}
75for exp in shortvars: 75for exp in shortvars:
76 shortvars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3") 76 shortvars_re[exp] = (re.compile('((^|[\'"\s\-\+])[A-Za-z0-9_\-:${}\.]+)_' + exp + '([\(\'"\s:])'), r"\1:" + exp + r"\3")
77 77
78package_re = {} 78package_re = {}
79for exp in packagevars: 79for exp in packagevars:
@@ -122,7 +122,7 @@ def processfile(fn):
122 pass 122 pass
123 123
124ourname = os.path.basename(sys.argv[0]) 124ourname = os.path.basename(sys.argv[0])
125ourversion = "0.9.2" 125ourversion = "0.9.3"
126 126
127if os.path.isfile(sys.argv[1]): 127if os.path.isfile(sys.argv[1]):
128 processfile(sys.argv[1]) 128 processfile(sys.argv[1])