diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-02-01 16:50:38 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-15 21:46:56 +0000 |
| commit | 54d0147307e0fb581db20603cfec58d74343a0de (patch) | |
| tree | 0924d0197faf85851987995fe249615d0ee28e16 /meta/classes/image.bbclass | |
| parent | f8183e4c6f63ac34ab17262f60ea4b64d6712e6f (diff) | |
| download | poky-54d0147307e0fb581db20603cfec58d74343a0de.tar.gz | |
meta: remove True option to getVar and getVarFlag calls (again)
* True is default since 2016 and most layers were already updated
not to pass this parameter where not necessary, e.g. oe-core was
updated couple times, first in:
https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f
Updated with the same regexp as later oe-core update:
https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba
with small modification to replace not only d.getVar, but also data.getVar as in e.g.:
e.data.getVar('ERR_REPORT_USERNAME', True)
and for getVarFlag:
sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
(From OE-Core rev: de7bf6689a19dc614ce4b39c84ffd825bee1b962)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 26c74fd10614582e177437608908eb43688ab510)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit 24a86d0c55ee89ae0dc77975e1d0ee02898d2289)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
| -rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index c424c4c41d..aa14ea2316 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
| @@ -440,7 +440,7 @@ python () { | |||
| 440 | localdata.delVar('DATE') | 440 | localdata.delVar('DATE') |
| 441 | localdata.delVar('TMPDIR') | 441 | localdata.delVar('TMPDIR') |
| 442 | localdata.delVar('IMAGE_VERSION_SUFFIX') | 442 | localdata.delVar('IMAGE_VERSION_SUFFIX') |
| 443 | vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split() | 443 | vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude') or '').split() |
| 444 | for dep in vardepsexclude: | 444 | for dep in vardepsexclude: |
| 445 | localdata.delVar(dep) | 445 | localdata.delVar(dep) |
| 446 | 446 | ||
