summaryrefslogtreecommitdiffstats
path: root/meta/classes/sstate.bbclass
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-01-13 11:16:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-14 11:35:56 +0000
commitdfd833725dab28015474359754883a67bbc80cc6 (patch)
tree8e662381b09eb469f0e37c6ebeb2e307e8c25e41 /meta/classes/sstate.bbclass
parent7f457682544e1ca80e7f3637d8ffddd9ede8ff57 (diff)
downloadpoky-dfd833725dab28015474359754883a67bbc80cc6.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) Signed-off-by: André Draszik <andre.draszik@jci.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r--meta/classes/sstate.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index da0807d6e9..482ffa83f9 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -379,7 +379,7 @@ def sstate_installpkgdir(ss, d):
379 379
380 for plain in ss['plaindirs']: 380 for plain in ss['plaindirs']:
381 workdir = d.getVar('WORKDIR') 381 workdir = d.getVar('WORKDIR')
382 sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") 382 sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared")
383 src = sstateinst + "/" + plain.replace(workdir, '') 383 src = sstateinst + "/" + plain.replace(workdir, '')
384 if sharedworkdir in plain: 384 if sharedworkdir in plain:
385 src = sstateinst + "/" + plain.replace(sharedworkdir, '') 385 src = sstateinst + "/" + plain.replace(sharedworkdir, '')
@@ -640,7 +640,7 @@ def sstate_package(ss, d):
640 os.rename(state[1], sstatebuild + state[0]) 640 os.rename(state[1], sstatebuild + state[0])
641 641
642 workdir = d.getVar('WORKDIR') 642 workdir = d.getVar('WORKDIR')
643 sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") 643 sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared")
644 for plain in ss['plaindirs']: 644 for plain in ss['plaindirs']:
645 pdir = plain.replace(workdir, sstatebuild) 645 pdir = plain.replace(workdir, sstatebuild)
646 if sharedworkdir in plain: 646 if sharedworkdir in plain: