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 701660f57..e0f0dbca4 100644 --- a/meta-oe/classes/scancode.bbclass +++ b/meta-oe/classes/scancode.bbclass | |||
@@ -3,18 +3,18 @@ | |||
3 | # For more informaiton https://github.com/nexB/scancode-toolkit | 3 | # For more informaiton https://github.com/nexB/scancode-toolkit |
4 | 4 | ||
5 | SCANCODE_FORMAT ?= "html-app" | 5 | SCANCODE_FORMAT ?= "html-app" |
6 | EXT = "${@'html' if d.getVar('SCANCODE_FORMAT', True) == 'html-app' else 'json'}" | 6 | EXT = "${@'html' if d.getVar('SCANCODE_FORMAT') == 'html-app' else 'json'}" |
7 | SCANCODE_TOOLKIT = "${@get_scancode_toolkit(d)}" | 7 | SCANCODE_TOOLKIT = "${@get_scancode_toolkit(d)}" |
8 | SCANCODE_TAG = "v2.2.1" | 8 | SCANCODE_TAG = "v2.2.1" |
9 | SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git" | 9 | SCANCODE_GIT_LOCATION ?= "https://github.com/nexB/scancode-toolkit.git" |
10 | SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode" | 10 | SCANCODE_SRC_LOCATION ?= "${DL_DIR}/scancode" |
11 | 11 | ||
12 | def get_scancode_toolkit(d): | 12 | def get_scancode_toolkit(d): |
13 | lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION', True) + ".lock") | 13 | lf = bb.utils.lockfile(d.getVar('SCANCODE_SRC_LOCATION') + ".lock") |
14 | if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION', True))): | 14 | if (not os.path.exists(d.getVar('SCANCODE_SRC_LOCATION'))): |
15 | 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))) | 15 | os.system("git clone %s %s -b %s" % (d.getVar('SCANCODE_GIT_LOCATION'), d.getVar('SCANCODE_SRC_LOCATION'), d.getVar('SCANCODE_TAG'))) |
16 | bb.utils.unlockfile(lf) | 16 | bb.utils.unlockfile(lf) |
17 | return (d.getVar('SCANCODE_SRC_LOCATION', True)) | 17 | return (d.getVar('SCANCODE_SRC_LOCATION')) |
18 | 18 | ||
19 | do_scancode() { | 19 | do_scancode() { |
20 | mkdir -p ${DEPLOY_DIR_IMAGE}/scancode | 20 | mkdir -p ${DEPLOY_DIR_IMAGE}/scancode |