mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 13:29:49 +00:00
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>
This commit is contained in:
@@ -129,7 +129,7 @@ def sstate_install(ss, d):
|
||||
|
||||
sharedfiles = []
|
||||
shareddirs = []
|
||||
bb.mkdirhier(d.expand("${SSTATE_MANIFESTS}"))
|
||||
bb.utils.mkdirhier(d.expand("${SSTATE_MANIFESTS}"))
|
||||
|
||||
d2 = d.createCopy()
|
||||
extrainf = d.getVarFlag("do_" + ss['task'], 'stamp-extra-info', True)
|
||||
@@ -215,7 +215,7 @@ def sstate_installpkg(ss, d):
|
||||
# remove dir if it exists, ensure any parent directories do exist
|
||||
if os.path.exists(dir):
|
||||
oe.path.remove(dir)
|
||||
bb.mkdirhier(dir)
|
||||
bb.utils.mkdirhier(dir)
|
||||
oe.path.remove(dir)
|
||||
|
||||
sstateinst = d.expand("${WORKDIR}/sstate-install-%s/" % ss['name'])
|
||||
@@ -281,7 +281,7 @@ def sstate_installpkg(ss, d):
|
||||
workdir = d.getVar('WORKDIR', True)
|
||||
src = sstateinst + "/" + plain.replace(workdir, '')
|
||||
dest = plain
|
||||
bb.mkdirhier(src)
|
||||
bb.utils.mkdirhier(src)
|
||||
prepdir(dest)
|
||||
os.rename(src, dest)
|
||||
|
||||
@@ -456,8 +456,8 @@ def sstate_package(ss, d):
|
||||
sstatebuild = d.expand("${WORKDIR}/sstate-build-%s/" % ss['name'])
|
||||
sstatepkg = d.getVar('SSTATE_PKG', True) + '_'+ ss['name'] + ".tgz"
|
||||
bb.utils.remove(sstatebuild, recurse=True)
|
||||
bb.mkdirhier(sstatebuild)
|
||||
bb.mkdirhier(os.path.dirname(sstatepkg))
|
||||
bb.utils.mkdirhier(sstatebuild)
|
||||
bb.utils.mkdirhier(os.path.dirname(sstatepkg))
|
||||
for state in ss['dirs']:
|
||||
if not os.path.exists(state[1]):
|
||||
continue
|
||||
@@ -477,8 +477,8 @@ def sstate_package(ss, d):
|
||||
workdir = d.getVar('WORKDIR', True)
|
||||
for plain in ss['plaindirs']:
|
||||
pdir = plain.replace(workdir, sstatebuild)
|
||||
bb.mkdirhier(plain)
|
||||
bb.mkdirhier(pdir)
|
||||
bb.utils.mkdirhier(plain)
|
||||
bb.utils.mkdirhier(pdir)
|
||||
oe.path.copyhardlinktree(plain, pdir)
|
||||
|
||||
d.setVar('SSTATE_BUILDDIR', sstatebuild)
|
||||
@@ -503,7 +503,7 @@ def pstaging_fetch(sstatefetch, sstatepkg, d):
|
||||
bb.data.update_data(localdata)
|
||||
|
||||
dldir = localdata.expand("${SSTATE_DIR}")
|
||||
bb.mkdirhier(dldir)
|
||||
bb.utils.mkdirhier(dldir)
|
||||
|
||||
localdata.delVar('MIRRORS')
|
||||
localdata.delVar('FILESPATH')
|
||||
|
||||
Reference in New Issue
Block a user