diff options
Diffstat (limited to 'meta/classes/package_tar.bbclass')
| -rw-r--r-- | meta/classes/package_tar.bbclass | 149 |
1 files changed, 57 insertions, 92 deletions
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index a806e4514b..ce3ab4c8e2 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass @@ -2,107 +2,72 @@ inherit package IMAGE_PKGTYPE ?= "tar" -python package_tar_fn () { - fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d), "%s-%s-%s.tar.gz" % (bb.data.getVar('PKG', d), bb.data.getVar('PKGV', d), bb.data.getVar('PKGR', d))) - fn = bb.data.expand(fn, d) - bb.data.setVar('PKGFN', fn, d) -} - -python package_tar_install () { - pkg = bb.data.getVar('PKG', d, 1) - pkgfn = bb.data.getVar('PKGFN', d, 1) - rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) - - if None in (pkg,pkgfn,rootfs): - bb.error("missing variables (one or more of PKG, PKGFN, IMAGEROOTFS)") - raise bb.build.FuncFailed - try: - bb.mkdirhier(rootfs) - os.chdir(rootfs) - except OSError: - import sys - (type, value, traceback) = sys.exc_info() - print value - raise bb.build.FuncFailed - - if not os.access(pkgfn, os.R_OK): - bb.debug(1, "%s does not exist, skipping" % pkgfn) - raise bb.build.FuncFailed - - ret = os.system('zcat %s | tar -xf -' % pkgfn) - if ret != 0: - raise bb.build.FuncFailed -} - python do_package_tar () { - workdir = bb.data.getVar('WORKDIR', d, 1) - if not workdir: - bb.error("WORKDIR not defined, unable to package") - return - - outdir = bb.data.getVar('DEPLOY_DIR_TAR', d, 1) - if not outdir: - bb.error("DEPLOY_DIR_TAR not defined, unable to package") - return - bb.mkdirhier(outdir) - - dvar = bb.data.getVar('D', d, 1) - if not dvar: - bb.error("D not defined, unable to package") - return - bb.mkdirhier(dvar) - - packages = bb.data.getVar('PACKAGES', d, 1) - if not packages: - bb.debug(1, "PACKAGES not defined, nothing to package") - return - - for pkg in packages.split(): - 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) - - overrides = bb.data.getVar('OVERRIDES', localdata) - 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) - - bb.data.update_data(localdata) - - root = bb.data.getVar('ROOT', localdata) - 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) - os.chdir(root) - from glob import glob - if not glob('*'): - bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PKGV', localdata, 1), bb.data.getVar('PKGR', localdata, 1))) - continue - ret = os.system("tar -czf %s %s" % (tarfn, '.')) - if ret != 0: - bb.error("Creation of tar %s failed." % tarfn) + import subprocess + + oldcwd = os.getcwd() + + workdir = d.getVar('WORKDIR') + if not workdir: + bb.error("WORKDIR not defined, unable to package") + return + + outdir = d.getVar('DEPLOY_DIR_TAR') + if not outdir: + bb.error("DEPLOY_DIR_TAR not defined, unable to package") + return + + dvar = d.getVar('D') + if not dvar: + bb.error("D not defined, unable to package") + return + + packages = d.getVar('PACKAGES') + if not packages: + bb.debug(1, "PACKAGES not defined, nothing to package") + return + + pkgdest = d.getVar('PKGDEST') + + bb.utils.mkdirhier(outdir) + bb.utils.mkdirhier(dvar) + + for pkg in packages.split(): + localdata = bb.data.createCopy(d) + root = "%s/%s" % (pkgdest, pkg) + + overrides = localdata.getVar('OVERRIDES', False) + localdata.setVar('OVERRIDES', '%s:%s' % (overrides, pkg)) + + bb.utils.mkdirhier(root) + basedir = os.path.dirname(root) + tarfn = localdata.expand("${DEPLOY_DIR_TAR}/${PKG}-${PKGV}-${PKGR}.tar.gz") + os.chdir(root) + dlist = os.listdir(root) + if not dlist: + bb.note("Not creating empty archive for %s-%s-%s" % (pkg, localdata.getVar('PKGV'), localdata.getVar('PKGR'))) + continue + args = "tar -cz --exclude=CONTROL --exclude=DEBIAN -f".split() + ret = subprocess.call(args + [tarfn] + dlist) + if ret != 0: + bb.error("Creation of tar %s failed." % tarfn) + + os.chdir(oldcwd) } python () { - if bb.data.getVar('PACKAGES', d, True) != '': - deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split() + if d.getVar('PACKAGES') != '': + 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') - bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d) - bb.data.setVarFlag('do_package_write_ipk', 'fakeroot', "1", d) + d.setVarFlag('do_package_write_tar', 'depends', " ".join(deps)) + d.setVarFlag('do_package_write_tar', 'fakeroot', "1") } python do_package_write_tar () { - bb.build.exec_func("read_subpackage_metadata", d) - bb.build.exec_func("do_package_tar", d) + bb.build.exec_func("read_subpackage_metadata", d) + bb.build.exec_func("do_package_tar", d) } do_package_write_tar[dirs] = "${D}" -addtask package_write_tar before do_build after do_package +addtask package_write_tar before do_build after do_packagedata do_package |