merge of '471f6e7d5fb5bc4d13a2338851dabca9f72b3f0a'

[openembedded.git] / classes / package_tar.bbclass

diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass
index 9217811..cb4c42b 100644 (file)
--- a/classes/package_tar.bbclass
+++ b/classes/package_tar.bbclass
@@ -1,6 +1,6 @@
 inherit package
 
-PACKAGE_WRITE_FUNCS += "do_package_tar"
+IMAGE_PKGTYPE ?= "tar"
 
 python package_tar_fn () {
        import os
@@ -75,7 +75,7 @@ python do_package_tar () {
                bb.data.setVar('OVERRIDES', '%s:%s' % (overrides, pkg), localdata)
 
                bb.data.update_data(localdata)
-# stuff
+
                root = bb.data.getVar('ROOT', localdata)
                bb.mkdirhier(root)
                basedir = os.path.dirname(root)
@@ -94,9 +94,18 @@ python do_package_tar () {
                ret = os.system("tar -czvf %s %s" % (tarfn, '.'))
                if ret != 0:
                        bb.error("Creation of tar %s failed." % tarfn)
+}
+
+python () {
+    import bb
+    if bb.data.getVar('PACKAGES', d, True) != '':
+        bb.data.setVarFlag('do_package_write_tar', 'depends', 'tar-native:do_populate_staging', d)
+}
 
-               file(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), 'w').close()
 
-# end stuff
-               del localdata
+python do_package_write_tar () {
+       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