diff options
Diffstat (limited to 'meta/classes/package_tar.bbclass')
| -rw-r--r-- | meta/classes/package_tar.bbclass | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index 876cec6cf..68b1bf0fe 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass @@ -3,18 +3,15 @@ inherit package IMAGE_PKGTYPE ?= "tar" python package_tar_fn () { - import os - from bb import data - fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d), "%s-%s-%s.tar.gz" % (bb.data.getVar('PKG', d), bb.data.getVar('PV', d), bb.data.getVar('PR', d))) - fn = bb.data.expand(fn, d) - bb.data.setVar('PKGFN', fn, d) + 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 package_tar_install () { - import os, sys - pkg = bb.data.getVar('PKG', d, 1) - pkgfn = bb.data.getVar('PKGFN', d, 1) - rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) + pkg = d.getVar('PKG', True) + pkgfn = d.getVar('PKGFN', True) + rootfs = d.getVar('IMAGE_ROOTFS', True) if None in (pkg,pkgfn,rootfs): bb.error("missing variables (one or more of PKG, PKGFN, IMAGEROOTFS)") @@ -23,6 +20,7 @@ python package_tar_install () { bb.mkdirhier(rootfs) os.chdir(rootfs) except OSError: + import sys (type, value, traceback) = sys.exc_info() print value raise bb.build.FuncFailed @@ -37,25 +35,24 @@ python package_tar_install () { } python do_package_tar () { - workdir = bb.data.getVar('WORKDIR', d, 1) + workdir = d.getVar('WORKDIR', True) if not workdir: bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations - outdir = bb.data.getVar('DEPLOY_DIR_TAR', d, 1) + 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 = bb.data.getVar('D', d, 1) + dvar = d.getVar('D', True) if not dvar: bb.error("D not defined, unable to package") return bb.mkdirhier(dvar) - packages = bb.data.getVar('PACKAGES', d, 1) + packages = d.getVar('PACKAGES', True) if not packages: bb.debug(1, "PACKAGES not defined, nothing to package") return @@ -64,29 +61,29 @@ python do_package_tar () { localdata = bb.data.createCopy(d) root = "%s/install/%s" % (workdir, pkg) - bb.data.setVar('ROOT', '', localdata) - bb.data.setVar('ROOT_%s' % pkg, root, localdata) - bb.data.setVar('PKG', pkg, localdata) + localdata.setVar('ROOT', '') + localdata.setVar('ROOT_%s' % pkg, root) + localdata.setVar('PKG', pkg) - overrides = bb.data.getVar('OVERRIDES', localdata) + overrides = localdata.getVar('OVERRIDES') if not overrides: raise bb.build.FuncFailed('OVERRIDES not defined') - overrides = bb.data.expand(overrides, localdata) - bb.data.setVar('OVERRIDES', '%s:%s' % (overrides, pkg), localdata) + overrides = localdata.expand(overrides) + localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg)) bb.data.update_data(localdata) - root = bb.data.getVar('ROOT', 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 = bb.data.getVar('PKGFN', localdata, 1) + 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, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) + bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV', True), localdata.getVar('PKGR', True))) continue ret = os.system("tar -czf %s %s" % (tarfn, '.')) if ret != 0: @@ -94,12 +91,12 @@ python do_package_tar () { } python () { - import bb - if bb.data.getVar('PACKAGES', d, True) != '': - deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split() - deps.append('tar-native:do_populate_staging') - deps.append('fakeroot-native:do_populate_staging') - bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d) + if d.getVar('PACKAGES', True) != '': + deps = (d.getVarFlag('do_package_write_tar', 'depends') or "").split() + deps.append('tar-native:do_populate_sysroot') + deps.append('virtual/fakeroot-native:do_populate_sysroot') + d.setVarFlag('do_package_write_tar', 'depends', " ".join(deps)) + d.setVarFlag('do_package_write_ipk', 'fakeroot', "1") } |