[oe-commits] Richard Purdie : package_tar: Remove completely pointless code

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: e3b21455e4ecc5b4961cf52e035a2d6d541faf69
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e3b21455e4ecc5b4961cf52e035a2d6d541faf69

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sun Feb 17 09:03:28 2013 +0000

package_tar: Remove completely pointless code

Remove/simply overcomplicated code. No functionality change.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package_tar.bbclass |   25 ++++---------------------
 1 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
index 27cddaa..56bca89 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('*'):