diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/classes/copyleft_compliance.bbclass | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/copyleft_compliance.bbclass')
-rw-r--r-- | meta/classes/copyleft_compliance.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass index 907c1836b3..eabf12ce7a 100644 --- a/meta/classes/copyleft_compliance.bbclass +++ b/meta/classes/copyleft_compliance.bbclass | |||
@@ -13,7 +13,7 @@ python do_prepare_copyleft_sources () { | |||
13 | import os.path | 13 | import os.path |
14 | import shutil | 14 | import shutil |
15 | 15 | ||
16 | p = d.getVar('P', True) | 16 | p = d.getVar('P') |
17 | included, reason = copyleft_should_include(d) | 17 | included, reason = copyleft_should_include(d) |
18 | if not included: | 18 | if not included: |
19 | bb.debug(1, 'copyleft: %s is excluded: %s' % (p, reason)) | 19 | bb.debug(1, 'copyleft: %s is excluded: %s' % (p, reason)) |
@@ -21,13 +21,13 @@ python do_prepare_copyleft_sources () { | |||
21 | else: | 21 | else: |
22 | bb.debug(1, 'copyleft: %s is included: %s' % (p, reason)) | 22 | bb.debug(1, 'copyleft: %s is included: %s' % (p, reason)) |
23 | 23 | ||
24 | sources_dir = d.getVar('COPYLEFT_SOURCES_DIR', True) | 24 | sources_dir = d.getVar('COPYLEFT_SOURCES_DIR') |
25 | dl_dir = d.getVar('DL_DIR', True) | 25 | dl_dir = d.getVar('DL_DIR') |
26 | src_uri = d.getVar('SRC_URI', True).split() | 26 | src_uri = d.getVar('SRC_URI').split() |
27 | fetch = bb.fetch2.Fetch(src_uri, d) | 27 | fetch = bb.fetch2.Fetch(src_uri, d) |
28 | ud = fetch.ud | 28 | ud = fetch.ud |
29 | 29 | ||
30 | pf = d.getVar('PF', True) | 30 | pf = d.getVar('PF') |
31 | dest = os.path.join(sources_dir, pf) | 31 | dest = os.path.join(sources_dir, pf) |
32 | shutil.rmtree(dest, ignore_errors=True) | 32 | shutil.rmtree(dest, ignore_errors=True) |
33 | bb.utils.mkdirhier(dest) | 33 | bb.utils.mkdirhier(dest) |