diff options
author | André Draszik <andre.draszik@jci.com> | 2019-01-13 11:16:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-06 16:38:31 +0000 |
commit | afadb9aa510f5ba4809fc43e3987ef30f94495aa (patch) | |
tree | a04dacc73d8f726a3c5de32bc4da968d5aa665a2 /meta/classes/sstate.bbclass | |
parent | 46d75fd3db307c9058d80bdc8efe38087dc556ed (diff) | |
download | poky-afadb9aa510f5ba4809fc43e3987ef30f94495aa.tar.gz |
meta: remove True option to getVar calls (again)
A couple have still been missed in the past despite multiple
attempts at doing so (or simply have re-appeared?).
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
(From OE-Core rev: 9f551d588693328e4d99d33be94f26684eafcaba)
(From OE-Core rev: 2da88ecbbf118bb7440f48184d4b39c273ab57e9)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r-- | meta/classes/sstate.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index e61490ae90..edbfba5de3 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass | |||
@@ -362,7 +362,7 @@ def sstate_installpkgdir(ss, d): | |||
362 | 362 | ||
363 | for plain in ss['plaindirs']: | 363 | for plain in ss['plaindirs']: |
364 | workdir = d.getVar('WORKDIR') | 364 | workdir = d.getVar('WORKDIR') |
365 | sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") | 365 | sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared") |
366 | src = sstateinst + "/" + plain.replace(workdir, '') | 366 | src = sstateinst + "/" + plain.replace(workdir, '') |
367 | if sharedworkdir in plain: | 367 | if sharedworkdir in plain: |
368 | src = sstateinst + "/" + plain.replace(sharedworkdir, '') | 368 | src = sstateinst + "/" + plain.replace(sharedworkdir, '') |
@@ -623,7 +623,7 @@ def sstate_package(ss, d): | |||
623 | os.rename(state[1], sstatebuild + state[0]) | 623 | os.rename(state[1], sstatebuild + state[0]) |
624 | 624 | ||
625 | workdir = d.getVar('WORKDIR') | 625 | workdir = d.getVar('WORKDIR') |
626 | sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") | 626 | sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared") |
627 | for plain in ss['plaindirs']: | 627 | for plain in ss['plaindirs']: |
628 | pdir = plain.replace(workdir, sstatebuild) | 628 | pdir = plain.replace(workdir, sstatebuild) |
629 | if sharedworkdir in plain: | 629 | if sharedworkdir in plain: |