summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-05 11:12:27 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-19 20:06:25 +0100
commit14801197f97d33c715d387315c20fb4269b2fb91 (patch)
tree30807a617bd27b5ef7bff512173feb8bc0cabe8f
parentc7a80295702a65c4bd528accbb4bb6f9998505f5 (diff)
downloadpoky-14801197f97d33c715d387315c20fb4269b2fb91.tar.gz
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.bbclass17
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"
5IPKGCONF_TARGET = "${WORKDIR}/opkg.conf" 5IPKGCONF_TARGET = "${WORKDIR}/opkg.conf"
6IPKGCONF_SDK = "${WORKDIR}/opkg-sdk.conf" 6IPKGCONF_SDK = "${WORKDIR}/opkg-sdk.conf"
7 7
8PKGWRITEDIRIPK = "${WORKDIR}/deploy-ipks"
9
8python package_ipk_fn () { 10python package_ipk_fn () {
9 bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d) 11 bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
10} 12}
@@ -136,7 +138,7 @@ python do_package_ipk () {
136 import re, copy 138 import re, copy
137 139
138 workdir = bb.data.getVar('WORKDIR', d, True) 140 workdir = bb.data.getVar('WORKDIR', d, True)
139 outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, True) 141 outdir = bb.data.getVar('PKGWRITEDIRIPK', d, True)
140 dvar = bb.data.getVar('D', d, True) 142 dvar = bb.data.getVar('D', d, True)
141 tmpdir = bb.data.getVar('TMPDIR', d, True) 143 tmpdir = bb.data.getVar('TMPDIR', d, True)
142 pkgdest = bb.data.getVar('PKGDEST', d, True) 144 pkgdest = bb.data.getVar('PKGDEST', d, True)
@@ -295,7 +297,18 @@ python do_package_ipk () {
295 297
296 bb.utils.prunedir(controldir) 298 bb.utils.prunedir(controldir)
297 bb.utils.unlockfile(lf) 299 bb.utils.unlockfile(lf)
300
301}
302
303SSTATETASKS += "do_package_write_ipk"
304do_package_write_ipk[sstate-name] = "deploy-ipk"
305do_package_write_ipk[sstate-inputdirs] = "${PKGWRITEDIRIPK}"
306do_package_write_ipk[sstate-outputdirs] = "${DEPLOY_DIR_IPK}"
307
308python do_package_write_ipk_setscene () {
309 sstate_setscene(d)
298} 310}
311addtask do_package_write_ipk_setscene
299 312
300python () { 313python () {
301 if bb.data.getVar('PACKAGES', d, True) != '': 314 if bb.data.getVar('PACKAGES', d, True) != '':
@@ -309,5 +322,5 @@ python do_package_write_ipk () {
309 bb.build.exec_func("read_subpackage_metadata", d) 322 bb.build.exec_func("read_subpackage_metadata", d)
310 bb.build.exec_func("do_package_ipk", d) 323 bb.build.exec_func("do_package_ipk", d)
311} 324}
312do_package_write_ipk[dirs] = "${D}" 325do_package_write_ipk[dirs] = "${PKGWRITEDIRIPK}"
313addtask package_write_ipk before do_package_write after do_package 326addtask package_write_ipk before do_package_write after do_package