mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -7,27 +7,27 @@ python do_package_tar () {
|
||||
|
||||
oldcwd = os.getcwd()
|
||||
|
||||
workdir = d.getVar('WORKDIR', True)
|
||||
workdir = d.getVar('WORKDIR')
|
||||
if not workdir:
|
||||
bb.error("WORKDIR not defined, unable to package")
|
||||
return
|
||||
|
||||
outdir = d.getVar('DEPLOY_DIR_TAR', True)
|
||||
outdir = d.getVar('DEPLOY_DIR_TAR')
|
||||
if not outdir:
|
||||
bb.error("DEPLOY_DIR_TAR not defined, unable to package")
|
||||
return
|
||||
|
||||
dvar = d.getVar('D', True)
|
||||
dvar = d.getVar('D')
|
||||
if not dvar:
|
||||
bb.error("D not defined, unable to package")
|
||||
return
|
||||
|
||||
packages = d.getVar('PACKAGES', True)
|
||||
packages = d.getVar('PACKAGES')
|
||||
if not packages:
|
||||
bb.debug(1, "PACKAGES not defined, nothing to package")
|
||||
return
|
||||
|
||||
pkgdest = d.getVar('PKGDEST', True)
|
||||
pkgdest = d.getVar('PKGDEST')
|
||||
|
||||
bb.utils.mkdirhier(outdir)
|
||||
bb.utils.mkdirhier(dvar)
|
||||
@@ -46,7 +46,7 @@ python do_package_tar () {
|
||||
os.chdir(root)
|
||||
dlist = os.listdir(root)
|
||||
if not dlist:
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True)))
|
||||
bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR')))
|
||||
continue
|
||||
args = "tar -cz --exclude=CONTROL --exclude=DEBIAN -f".split()
|
||||
ret = subprocess.call(args + [tarfn] + dlist)
|
||||
@@ -57,7 +57,7 @@ python do_package_tar () {
|
||||
}
|
||||
|
||||
python () {
|
||||
if d.getVar('PACKAGES', True) != '':
|
||||
if d.getVar('PACKAGES') != '':
|
||||
deps = (d.getVarFlag('do_package_write_tar', 'depends', True) or "").split()
|
||||
deps.append('tar-native:do_populate_sysroot')
|
||||
deps.append('virtual/fakeroot-native:do_populate_sysroot')
|
||||
|
||||
Reference in New Issue
Block a user