From 2da88ecbbf118bb7440f48184d4b39c273ab57e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Draszik?= Date: Sun, 13 Jan 2019 11:16:01 +0000 Subject: meta: remove True option to getVar calls (again) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster --- meta/classes/sstate.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/sstate.bbclass') 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): for plain in ss['plaindirs']: workdir = d.getVar('WORKDIR') - sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") + sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared") src = sstateinst + "/" + plain.replace(workdir, '') if sharedworkdir in plain: src = sstateinst + "/" + plain.replace(sharedworkdir, '') @@ -623,7 +623,7 @@ def sstate_package(ss, d): os.rename(state[1], sstatebuild + state[0]) workdir = d.getVar('WORKDIR') - sharedworkdir = os.path.join(d.getVar('TMPDIR', True), "work-shared") + sharedworkdir = os.path.join(d.getVar('TMPDIR'), "work-shared") for plain in ss['plaindirs']: pdir = plain.replace(workdir, sstatebuild) if sharedworkdir in plain: -- cgit v1.2.3