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/package_tar.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/package_tar.bbclass')
-rw-r--r-- | meta/classes/package_tar.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index e217814af4..3ff8b8f560 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass | |||
@@ -7,27 +7,27 @@ python do_package_tar () { | |||
7 | 7 | ||
8 | oldcwd = os.getcwd() | 8 | oldcwd = os.getcwd() |
9 | 9 | ||
10 | workdir = d.getVar('WORKDIR', True) | 10 | workdir = d.getVar('WORKDIR') |
11 | if not workdir: | 11 | if not workdir: |
12 | bb.error("WORKDIR not defined, unable to package") | 12 | bb.error("WORKDIR not defined, unable to package") |
13 | return | 13 | return |
14 | 14 | ||
15 | outdir = d.getVar('DEPLOY_DIR_TAR', True) | 15 | outdir = d.getVar('DEPLOY_DIR_TAR') |
16 | if not outdir: | 16 | if not outdir: |
17 | bb.error("DEPLOY_DIR_TAR not defined, unable to package") | 17 | bb.error("DEPLOY_DIR_TAR not defined, unable to package") |
18 | return | 18 | return |
19 | 19 | ||
20 | dvar = d.getVar('D', True) | 20 | dvar = d.getVar('D') |
21 | if not dvar: | 21 | if not dvar: |
22 | bb.error("D not defined, unable to package") | 22 | bb.error("D not defined, unable to package") |
23 | return | 23 | return |
24 | 24 | ||
25 | packages = d.getVar('PACKAGES', True) | 25 | packages = d.getVar('PACKAGES') |
26 | if not packages: | 26 | if not packages: |
27 | bb.debug(1, "PACKAGES not defined, nothing to package") | 27 | bb.debug(1, "PACKAGES not defined, nothing to package") |
28 | return | 28 | return |
29 | 29 | ||
30 | pkgdest = d.getVar('PKGDEST', True) | 30 | pkgdest = d.getVar('PKGDEST') |
31 | 31 | ||
32 | bb.utils.mkdirhier(outdir) | 32 | bb.utils.mkdirhier(outdir) |
33 | bb.utils.mkdirhier(dvar) | 33 | bb.utils.mkdirhier(dvar) |
@@ -46,7 +46,7 @@ python do_package_tar () { | |||
46 | os.chdir(root) | 46 | os.chdir(root) |
47 | dlist = os.listdir(root) | 47 | dlist = os.listdir(root) |
48 | if not dlist: | 48 | if not dlist: |
49 | bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) | 49 | bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR'))) |
50 | continue | 50 | continue |
51 | args = "tar -cz --exclude=CONTROL --exclude=DEBIAN -f".split() | 51 | args = "tar -cz --exclude=CONTROL --exclude=DEBIAN -f".split() |
52 | ret = subprocess.call(args + [tarfn] + dlist) | 52 | ret = subprocess.call(args + [tarfn] + dlist) |
@@ -57,7 +57,7 @@ python do_package_tar () { | |||
57 | } | 57 | } |
58 | 58 | ||
59 | python () { | 59 | python () { |
60 | if d.getVar('PACKAGES', True) != '': | 60 | if d.getVar('PACKAGES') != '': |
61 | deps = (d.getVarFlag('do_package_write_tar', 'depends', True) or "").split() | 61 | deps = (d.getVarFlag('do_package_write_tar', 'depends', True) or "").split() |
62 | deps.append('tar-native:do_populate_sysroot') | 62 | deps.append('tar-native:do_populate_sysroot') |
63 | deps.append('virtual/fakeroot-native:do_populate_sysroot') | 63 | deps.append('virtual/fakeroot-native:do_populate_sysroot') |