* [PATCH] package_tar: Remove completely pointless code
@ 2013-02-17 9:03 Richard Purdie
0 siblings, 0 replies; only message in thread
From: Richard Purdie @ 2013-02-17 9:03 UTC (permalink / raw)
To: openembedded-core
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('*'):
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-02-17 9:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-17 9:03 [PATCH] package_tar: Remove completely pointless code Richard Purdie
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.