mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

package_tar: Fix whitespace

Browse Source 
(From OE-Core rev: fead6005b56f53535967476cc752691316e02183)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-02-17 09:01:35 +00:00
parent ba110d3b69
commit 398a6dcc84
1 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package_tar.bbclass
+51 -51
View File
@@ -3,66 +3,66 @@ inherit package
IMAGE_PKGTYPE ?= "tar" IMAGE_PKGTYPE ?= "tar"
python package_tar_fn () { 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 = 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) fn = d.expand(fn)
d.setVar('PKGFN', fn) d.setVar('PKGFN', fn)
} }
python do_package_tar () { python do_package_tar () {
import subprocess import subprocess
workdir = d.getVar('WORKDIR', True) workdir = d.getVar('WORKDIR', True)
if not workdir: if not workdir:
bb.error("WORKDIR not defined, unable to package") bb.error("WORKDIR not defined, unable to package")
return return
outdir = d.getVar('DEPLOY_DIR_TAR', True) outdir = d.getVar('DEPLOY_DIR_TAR', True)
if not outdir: if not outdir:
bb.error("DEPLOY_DIR_TAR not defined, unable to package") bb.error("DEPLOY_DIR_TAR not defined, unable to package")
return return
bb.mkdirhier(outdir) bb.mkdirhier(outdir)
dvar = d.getVar('D', True) dvar = d.getVar('D', True)
if not dvar: if not dvar:
bb.error("D not defined, unable to package") bb.error("D not defined, unable to package")
return return
bb.mkdirhier(dvar) bb.mkdirhier(dvar)
packages = d.getVar('PACKAGES', True) packages = d.getVar('PACKAGES', True)
if not packages: if not packages:
bb.debug(1, "PACKAGES not defined, nothing to package") bb.debug(1, "PACKAGES not defined, nothing to package")
return return
for pkg in packages.split(): for pkg in packages.split():
localdata = bb.data.createCopy(d) localdata = bb.data.createCopy(d)
root = "%s/install/%s" % (workdir, pkg) root = "%s/install/%s" % (workdir, pkg)
localdata.setVar('ROOT', '') localdata.setVar('ROOT', '')
localdata.setVar('ROOT_%s' % pkg, root) localdata.setVar('ROOT_%s' % pkg, root)
localdata.setVar('PKG', pkg) localdata.setVar('PKG', pkg)
overrides = localdata.getVar('OVERRIDES') overrides = localdata.getVar('OVERRIDES')
if not overrides: if not overrides:
raise bb.build.FuncFailed('OVERRIDES not defined') raise bb.build.FuncFailed('OVERRIDES not defined')
overrides = localdata.expand(overrides) overrides = localdata.expand(overrides)
localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg)) localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg))
bb.data.update_data(localdata) bb.data.update_data(localdata)
root = localdata.getVar('ROOT') root = localdata.getVar('ROOT')
bb.mkdirhier(root) bb.mkdirhier(root)
basedir = os.path.dirname(root) basedir = os.path.dirname(root)
pkgoutdir = outdir pkgoutdir = outdir
bb.mkdirhier(pkgoutdir) bb.mkdirhier(pkgoutdir)
bb.build.exec_func('package_tar_fn', localdata) bb.build.exec_func('package_tar_fn', localdata)
tarfn = localdata.getVar('PKGFN', True) tarfn = localdata.getVar('PKGFN', True)
os.chdir(root) os.chdir(root)
from glob import glob from glob import glob
if not glob('*'): if not glob('*'):
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', True), localdata.getVar('PKGR', True)))
continue continue
ret = subprocess.call("tar -czf %s %s" % (tarfn, '.'), shell=True) ret = subprocess.call("tar -czf %s %s" % (tarfn, '.'), shell=True)
if ret != 0: if ret != 0:
bb.error("Creation of tar %s failed." % tarfn) bb.error("Creation of tar %s failed." % tarfn)
} }
python () { python () {
@@ -76,8 +76,8 @@ python () {
python do_package_write_tar () { python do_package_write_tar () {
bb.build.exec_func("read_subpackage_metadata", d) bb.build.exec_func("read_subpackage_metadata", d)
bb.build.exec_func("do_package_tar", d) bb.build.exec_func("do_package_tar", d)
} }
do_package_write_tar[dirs] = "${D}" do_package_write_tar[dirs] = "${D}"
addtask package_write_tar before do_build after do_packagedata do_package addtask package_write_tar before do_build after do_packagedata do_package