summaryrefslogtreecommitdiffstats
path: root/meta/classes/sstate.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-01 08:52:40 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-01 15:51:42 +0100
commit554c892ccf16ca564e7be94f84eaa73667170e15 (patch)
tree01b74616570ebd473abf6bb287cdfcfbd797d41b /meta/classes/sstate.bbclass
parent6d9e3a19384cbd737fdac729c6c0de5b06f8ec12 (diff)
downloadpoky-554c892ccf16ca564e7be94f84eaa73667170e15.tar.gz
meta: Don't use deprecated bitbake API
These have been deprecated for a long time, convert the remaining references to the correct modules and prepare for removal of the compatibility support from bitbake. (From OE-Core rev: 6a39835af2b2b3c7797fe05479341d71a3f3aaf6) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-rw-r--r--meta/classes/sstate.bbclass16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index c86f393c6f..b088e58d98 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -129,7 +129,7 @@ def sstate_install(ss, d):
129 129
130 sharedfiles = [] 130 sharedfiles = []
131 shareddirs = [] 131 shareddirs = []
132 bb.mkdirhier(d.expand("${SSTATE_MANIFESTS}")) 132 bb.utils.mkdirhier(d.expand("${SSTATE_MANIFESTS}"))
133 133
134 d2 = d.createCopy() 134 d2 = d.createCopy()
135 extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True) 135 extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True)
@@ -215,7 +215,7 @@ def sstate_installpkg(ss, d):
215 # remove dir if it exists, ensure any parent directories do exist 215 # remove dir if it exists, ensure any parent directories do exist
216 if os.path.exists(dir): 216 if os.path.exists(dir):
217 oe.path.remove(dir) 217 oe.path.remove(dir)
218 bb.mkdirhier(dir) 218 bb.utils.mkdirhier(dir)
219 oe.path.remove(dir) 219 oe.path.remove(dir)
220 220
221 sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name']) 221 sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name'])
@@ -281,7 +281,7 @@ def sstate_installpkg(ss, d):
281 workdir = d.getVar('WORKDIR', True) 281 workdir = d.getVar('WORKDIR', True)
282 src = sstateinst + "/" + plain.replace(workdir, '') 282 src = sstateinst + "/" + plain.replace(workdir, '')
283 dest = plain 283 dest = plain
284 bb.mkdirhier(src) 284 bb.utils.mkdirhier(src)
285 prepdir(dest) 285 prepdir(dest)
286 os.rename(src, dest) 286 os.rename(src, dest)
287 287
@@ -456,8 +456,8 @@ def sstate_package(ss, d):
456 sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['name']) 456 sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['name'])
457 sstatepkg = d.getVar('SSTATE_PKG', True) + '_'+ ss['name'] + ".tgz" 457 sstatepkg = d.getVar('SSTATE_PKG', True) + '_'+ ss['name'] + ".tgz"
458 bb.utils.remove(sstatebuild, recurse=True) 458 bb.utils.remove(sstatebuild, recurse=True)
459 bb.mkdirhier(sstatebuild) 459 bb.utils.mkdirhier(sstatebuild)
460 bb.mkdirhier(os.path.dirname(sstatepkg)) 460 bb.utils.mkdirhier(os.path.dirname(sstatepkg))
461 for state in ss['dirs']: 461 for state in ss['dirs']:
462 if not os.path.exists(state[1]): 462 if not os.path.exists(state[1]):
463 continue 463 continue
@@ -477,8 +477,8 @@ def sstate_package(ss, d):
477 workdir = d.getVar('WORKDIR', True) 477 workdir = d.getVar('WORKDIR', True)
478 for plain in ss['plaindirs']: 478 for plain in ss['plaindirs']:
479 pdir = plain.replace(workdir, sstatebuild) 479 pdir = plain.replace(workdir, sstatebuild)
480 bb.mkdirhier(plain) 480 bb.utils.mkdirhier(plain)
481 bb.mkdirhier(pdir) 481 bb.utils.mkdirhier(pdir)
482 oe.path.copyhardlinktree(plain, pdir) 482 oe.path.copyhardlinktree(plain, pdir)
483 483
484 d.setVar('SSTATE_BUILDDIR', sstatebuild) 484 d.setVar('SSTATE_BUILDDIR', sstatebuild)
@@ -503,7 +503,7 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
503 bb.data.update_data(localdata) 503 bb.data.update_data(localdata)
504 504
505 dldir = localdata.expand("${SSTATE_DIR}") 505 dldir = localdata.expand("${SSTATE_DIR}")
506 bb.mkdirhier(dldir) 506 bb.utils.mkdirhier(dldir)
507 507
508 localdata.delVar('MIRRORS') 508 localdata.delVar('MIRRORS')
509 localdata.delVar('FILESPATH') 509 localdata.delVar('FILESPATH')