diff options
| author |   André Draszik <andre.draszik@jci.com> | 2019-01-13 10:55:51 +0000 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-01-13 10:28:01 -0800 |
| commit | e219649594742a200c1dd5d28e8bf2f5eda2504e (patch) | |
| tree | a83798cb84c1fcbe44cd2035aaaaba840966090b /meta-oe/classes | |
| parent | 24af1f974cc95c50dfa56ad15b113279c3993c5d (diff) | |
| download | meta-openembedded-e219649594742a200c1dd5d28e8bf2f5eda2504e.tar.gz | |
meta-oe: 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)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/classes')
| -rw-r--r-- | meta-oe/classes/scancode.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-oe/classes/scancode.bbclass b/meta-oe/classes/scancode.bbclass index 701660f578..e0f0dbca40 100644 --- a/meta-oe/classes/scancode.bbclass +++ b/meta-oe/classes/scancode.bbclass @@ -3,18 +3,18 @@ # For more informaiton https://github.com/nexB/scancode-toolkit SCANCODE_FORMAT ?= "html-app" -EXT = "${@'html' if d.getVar('SCANCODE_FORMAT', True) == 'html-app' else 'json'}" +EXT = "${@'html' if d.getVar('SCANCODE_FORMAT') == 'html-app' else 'json'}" SCANCODE_TOOLKIT = "${@get_scancode_toolkit(d)}" SCANCODE_TAG = "v2.2.1" SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git" SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode" def get_scancode_toolkit(d): - lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION', True) + ".lock") - if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION', True))): - os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION', True), d.getVar('SCANCODE_SRC_LOCATION', True), d.getVar('SCANCODE_TAG', True))) + lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION') + ".lock") + if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION'))): + os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION'), d.getVar('SCANCODE_SRC_LOCATION'), d.getVar('SCANCODE_TAG'))) bb.utils.unlockfile(lf) - return (d.getVar('SCANCODE_SRC_LOCATION', True)) + return (d.getVar('SCANCODE_SRC_LOCATION')) do_scancode() { mkdir -p ${DEPLOY_DIR_IMAGE}/scancode |