mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 03:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

package_tar: Remove completely pointless code

Browse Source 
Remove/simply overcomplicated code. No functionality change.

(From OE-Core rev: e3b21455e4ecc5b4961cf52e035a2d6d541faf69)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-02-17 09:03:28 +00:00
parent 7e629a36c9
commit 8fb417a67c
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
meta/classes/package_tar.bbclass
View File

@@ -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('*'):