summaryrefslogtreecommitdiff
path: root/meta/classes/package_deb.bbclass
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-08-05 10:52:10 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-19 20:06:25 +0100
commit0769e847cbefbbf2f083b7fc585a0479db6b18a1 (patch)
tree1913535866bd23de3d73a788aeb8f667108073ec /meta/classes/package_deb.bbclass
parent14801197f97d33c715d387315c20fb4269b2fb91 (diff)
downloadopenembedded-core-0769e847cbefbbf2f083b7fc585a0479db6b18a1.tar.gz
openembedded-core-0769e847cbefbbf2f083b7fc585a0479db6b18a1.tar.bz2
openembedded-core-0769e847cbefbbf2f083b7fc585a0479db6b18a1.tar.xz
openembedded-core-0769e847cbefbbf2f083b7fc585a0479db6b18a1.zip
package_(deb|rpm): Update to use packaged-staging2
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
-rw-r--r--meta/classes/package_deb.bbclass18
1 files changed, 15 insertions, 3 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 14498db83..d923ad107 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -14,6 +14,8 @@ DPKG_ARCH_i586 ?= "i386"
DPKG_ARCH_i686 ?= "i386"
DPKG_ARCH_pentium ?= "i386"
+PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs"
+
python package_deb_fn () {
bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
}
@@ -73,9 +75,9 @@ python do_package_deb () {
bb.error("WORKDIR not defined, unable to package")
return
- outdir = bb.data.getVar('DEPLOY_DIR_DEB', d, True)
+ outdir = bb.data.getVar('PKGWRITEDIRDEB', d, True)
if not outdir:
- bb.error("DEPLOY_DIR_DEB not defined, unable to package")
+ bb.error("PKGWRITEDIRDEB not defined, unable to package")
return
dvar = bb.data.getVar('D', d, True)
@@ -250,6 +252,16 @@ python do_package_deb () {
bb.utils.unlockfile(lf)
}
+SSTATETASKS += "do_package_write_deb"
+do_package_write_deb[sstate-name] = "deploy-deb"
+do_package_write_deb[sstate-inputdirs] = "${PKGWRITEDIRDEB}"
+do_package_write_deb[sstate-outputdirs] = "${DEPLOY_DIR_DEB}"
+
+python do_package_write_deb_setscene () {
+ sstate_setscene(d)
+}
+addtask do_package_write_deb_setscene
+
python () {
if bb.data.getVar('PACKAGES', d, True) != '':
deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split()
@@ -262,6 +274,6 @@ python do_package_write_deb () {
bb.build.exec_func("read_subpackage_metadata", d)
bb.build.exec_func("do_package_deb", d)
}
-do_package_write_deb[dirs] = "${D}"
+do_package_write_deb[dirs] = "${PKGWRITEDIRDEB}"
addtask package_write_deb before do_package_write after do_package