From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH] package_tar: Fix whitespace
Date: Sun, 17 Feb 2013 09:01:35 +0000 [thread overview]
Message-ID: <1361091695.31795.113.camel@ted> (raw)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
index aaa3ca6..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
reply other threads:[~2013-02-17 9:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1361091695.31795.113.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.