From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: [PATCH] package_tar: Remove completely pointless code
Date: Sun, 17 Feb 2013 09:03:28 +0000 [thread overview]
Message-ID: <1361091808.31795.115.camel@ted> (raw)
Remove/simply overcomplicated code. No functionality change.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
index 27cddaa..5e3058d 100644
--- a/meta/classes/package_tar.bbclass
+++ b/meta/classes/package_tar.bbclass
@@ -2,12 +2,6 @@ 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)
-}
-
python do_package_tar () {
import subprocess
workdir = d.getVar('WORKDIR', True)
@@ -19,42 +13,31 @@ python do_package_tar () {
if not outdir:
bb.error("DEPLOY_DIR_TAR not defined, unable to package")
return
- bb.utils.mkdirhier(outdir)
dvar = d.getVar('D', True)
if not dvar:
bb.error("D not defined, unable to package")
return
- bb.utils.mkdirhier(dvar)
packages = d.getVar('PACKAGES', True)
if not packages:
bb.debug(1, "PACKAGES not defined, nothing to package")
return
+ bb.utils.mkdirhier(outdir)
+ bb.utils.mkdirhier(dvar)
+
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)
-
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)
- root = localdata.getVar('ROOT')
bb.utils.mkdirhier(root)
basedir = os.path.dirname(root)
- pkgoutdir = outdir
- bb.utils.mkdirhier(pkgoutdir)
- bb.build.exec_func('package_tar_fn', localdata)
- tarfn = localdata.getVar('PKGFN', True)
+ tarfn = localdata.expand("${DEPLOY_DIR_TAR}/${PKG}-${PKGV}-${PKGR}.tar.gz")
os.chdir(root)
from glob import glob
if not glob('*'):
reply other threads:[~2013-02-17 9:19 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=1361091808.31795.115.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox