diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-05 11:12:27 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-19 20:06:25 +0100 |
| commit | 14801197f97d33c715d387315c20fb4269b2fb91 (patch) | |
| tree | 30807a617bd27b5ef7bff512173feb8bc0cabe8f | |
| parent | c7a80295702a65c4bd528accbb4bb6f9998505f5 (diff) | |
| download | openembedded-core-14801197f97d33c715d387315c20fb4269b2fb91.tar.gz openembedded-core-14801197f97d33c715d387315c20fb4269b2fb91.tar.bz2 openembedded-core-14801197f97d33c715d387315c20fb4269b2fb91.zip | |
package_ipk.bbclass: Convert to new task based staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index f720b78d78..2a93bd1a7c 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -5,6 +5,8 @@ IMAGE_PKGTYPE ?= "ipk" IPKGCONF_TARGET = "${WORKDIR}/opkg.conf" IPKGCONF_SDK = "${WORKDIR}/opkg-sdk.conf" +PKGWRITEDIRIPK = "${WORKDIR}/deploy-ipks" + python package_ipk_fn () { bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d) } @@ -136,7 +138,7 @@ python do_package_ipk () { import re, copy workdir = bb.data.getVar('WORKDIR', d, True) - outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, True) + outdir = bb.data.getVar('PKGWRITEDIRIPK', d, True) dvar = bb.data.getVar('D', d, True) tmpdir = bb.data.getVar('TMPDIR', d, True) pkgdest = bb.data.getVar('PKGDEST', d, True) @@ -295,7 +297,18 @@ python do_package_ipk () { bb.utils.prunedir(controldir) bb.utils.unlockfile(lf) + +} + +SSTATETASKS += "do_package_write_ipk" +do_package_write_ipk[sstate-name] = "deploy-ipk" +do_package_write_ipk[sstate-inputdirs] = "${PKGWRITEDIRIPK}" +do_package_write_ipk[sstate-outputdirs] = "${DEPLOY_DIR_IPK}" + +python do_package_write_ipk_setscene () { + sstate_setscene(d) } +addtask do_package_write_ipk_setscene python () { if bb.data.getVar('PACKAGES', d, True) != '': @@ -309,5 +322,5 @@ python do_package_write_ipk () { bb.build.exec_func("read_subpackage_metadata", d) bb.build.exec_func("do_package_ipk", d) } -do_package_write_ipk[dirs] = "${D}" +do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}" addtask package_write_ipk before do_package_write after do_package |