diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-17 09:01:35 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-17 22:32:03 +0000 |
commit | 398a6dcc84cc64cbee6bb991cbd1ac566b6d65d3 (patch) | |
tree | 0abd2cb89a16bdb740bceb9d3b30cab2376daf28 | |
parent | ba110d3b696738efa47fd7df65867567e8224c3b (diff) | |
download | ast2050-yocto-poky-398a6dcc84cc64cbee6bb991cbd1ac566b6d65d3.zip ast2050-yocto-poky-398a6dcc84cc64cbee6bb991cbd1ac566b6d65d3.tar.gz |
package_tar: Fix whitespace
(From OE-Core rev: fead6005b56f53535967476cc752691316e02183)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/package_tar.bbclass | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index d502847..475c898 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass @@ -3,66 +3,66 @@ inherit package IMAGE_PKGTYPE ?= "tar" python package_tar_fn () { - fn = os.path.join(d.getVar('DEPLOY_DIR_TAR'), "%s-%s-%s.tar.gz" % (d.getVar('PKG'), d.getVar('PKGV'), d.getVar('PKGR'))) - fn = d.expand(fn) - d.setVar('PKGFN', fn) + fn = os.path.join(d.getVar('DEPLOY_DIR_TAR'), "%s-%s-%s.tar.gz" % (d.getVar('PKG'), d.getVar('PKGV'), d.getVar('PKGR'))) + fn = d.expand(fn) + d.setVar('PKGFN', fn) } python do_package_tar () { - import subprocess - workdir = d.getVar('WORKDIR', True) - if not workdir: - bb.error("WORKDIR not defined, unable to package") - return + import subprocess + workdir = d.getVar('WORKDIR', True) + if not workdir: + bb.error("WORKDIR not defined, unable to package") + return - outdir = d.getVar('DEPLOY_DIR_TAR', True) - if not outdir: - bb.error("DEPLOY_DIR_TAR not defined, unable to package") - return - bb.mkdirhier(outdir) + outdir = d.getVar('DEPLOY_DIR_TAR', True) + if not outdir: + bb.error("DEPLOY_DIR_TAR not defined, unable to package") + return + bb.mkdirhier(outdir) - dvar = d.getVar('D', True) - if not dvar: - bb.error("D not defined, unable to package") - return - bb.mkdirhier(dvar) + dvar = d.getVar('D', True) + if not dvar: + bb.error("D not defined, unable to package") + return + bb.mkdirhier(dvar) - packages = d.getVar('PACKAGES', True) - if not packages: - bb.debug(1, "PACKAGES not defined, nothing to package") - return + packages = d.getVar('PACKAGES', True) + if not packages: + bb.debug(1, "PACKAGES not defined, nothing to package") + return - for pkg in packages.split(): - localdata = bb.data.createCopy(d) - root = "%s/install/%s" % (workdir, pkg) + for pkg in packages.split(): + localdata = bb.data.createCopy(d) + root = "%s/install/%s" % (workdir, pkg) - localdata.setVar('ROOT', '') - localdata.setVar('ROOT_%s' % pkg, root) - localdata.setVar('PKG', pkg) + localdata.setVar('ROOT', '') + localdata.setVar('ROOT_%s' % pkg, root) + localdata.setVar('PKG', pkg) - overrides = localdata.getVar('OVERRIDES') - if not overrides: - raise bb.build.FuncFailed('OVERRIDES not defined') - overrides = localdata.expand(overrides) - localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg)) + overrides = localdata.getVar('OVERRIDES') + if not overrides: + raise bb.build.FuncFailed('OVERRIDES not defined') + overrides = localdata.expand(overrides) + localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg)) - bb.data.update_data(localdata) + bb.data.update_data(localdata) - root = localdata.getVar('ROOT') - bb.mkdirhier(root) - basedir = os.path.dirname(root) - pkgoutdir = outdir - bb.mkdirhier(pkgoutdir) - bb.build.exec_func('package_tar_fn', localdata) - tarfn = localdata.getVar('PKGFN', True) - os.chdir(root) - from glob import glob - if not glob('*'): - bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) - continue - ret = subprocess.call("tar -czf %s %s" % (tarfn, '.'), shell=True) - if ret != 0: - bb.error("Creation of tar %s failed." % tarfn) + root = localdata.getVar('ROOT') + bb.mkdirhier(root) + basedir = os.path.dirname(root) + pkgoutdir = outdir + bb.mkdirhier(pkgoutdir) + bb.build.exec_func('package_tar_fn', localdata) + tarfn = localdata.getVar('PKGFN', True) + os.chdir(root) + from glob import glob + if not glob('*'): + bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) + continue + ret = subprocess.call("tar -czf %s %s" % (tarfn, '.'), shell=True) + if ret != 0: + bb.error("Creation of tar %s failed." % tarfn) } python () { @@ -76,8 +76,8 @@ python () { python do_package_write_tar () { - bb.build.exec_func("read_subpackage_metadata", d) - bb.build.exec_func("do_package_tar", d) + bb.build.exec_func("read_subpackage_metadata", d) + bb.build.exec_func("do_package_tar", d) } do_package_write_tar[dirs] = "${D}" addtask package_write_tar before do_build after do_packagedata do_package |