Switch some references to moved functions
(Bitbake rev: ddea2978cb969cf1381cfee5c055de0c9e56a4e3) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
c770c62fdc
commit
bcd9c57a96
|
@ -27,6 +27,7 @@
|
||||||
|
|
||||||
from bb import data, event, mkdirhier, utils
|
from bb import data, event, mkdirhier, utils
|
||||||
import bb, os, sys
|
import bb, os, sys
|
||||||
|
import bb.utils
|
||||||
|
|
||||||
# When we execute a python function we'd like certain things
|
# When we execute a python function we'd like certain things
|
||||||
# in all namespaces, hence we add them to __builtins__
|
# in all namespaces, hence we add them to __builtins__
|
||||||
|
@ -107,7 +108,7 @@ def exec_func(func, d, dirs = None):
|
||||||
else:
|
else:
|
||||||
dirs = (data.expand(flags['dirs'], d) or "").split()
|
dirs = (data.expand(flags['dirs'], d) or "").split()
|
||||||
for adir in dirs:
|
for adir in dirs:
|
||||||
mkdirhier(adir)
|
bb.utils.mkdirhier(adir)
|
||||||
|
|
||||||
if len(dirs) > 0:
|
if len(dirs) > 0:
|
||||||
adir = dirs[-1]
|
adir = dirs[-1]
|
||||||
|
@ -124,7 +125,7 @@ def exec_func(func, d, dirs = None):
|
||||||
t = data.getVar('T', d, 1)
|
t = data.getVar('T', d, 1)
|
||||||
if not t:
|
if not t:
|
||||||
bb.msg.fatal(bb.msg.domain.Build, "T not set")
|
bb.msg.fatal(bb.msg.domain.Build, "T not set")
|
||||||
mkdirhier(t)
|
bb.utils.mkdirhier(t)
|
||||||
logfile = "%s/log.%s.%s" % (t, func, str(os.getpid()))
|
logfile = "%s/log.%s.%s" % (t, func, str(os.getpid()))
|
||||||
runfile = "%s/run.%s.%s" % (t, func, str(os.getpid()))
|
runfile = "%s/run.%s.%s" % (t, func, str(os.getpid()))
|
||||||
|
|
||||||
|
@ -320,7 +321,7 @@ def stamp_internal(task, d, file_name):
|
||||||
if not stamp:
|
if not stamp:
|
||||||
return
|
return
|
||||||
stamp = "%s.%s" % (stamp, task)
|
stamp = "%s.%s" % (stamp, task)
|
||||||
mkdirhier(os.path.dirname(stamp))
|
bb.utils.mkdirhier(os.path.dirname(stamp))
|
||||||
# Remove the file and recreate to force timestamp
|
# Remove the file and recreate to force timestamp
|
||||||
# change on broken NFS filesystems
|
# change on broken NFS filesystems
|
||||||
if os.access(stamp, os.F_OK):
|
if os.access(stamp, os.F_OK):
|
||||||
|
|
|
@ -27,6 +27,7 @@ BitBake build tools.
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import bb
|
import bb
|
||||||
|
import bb.utils
|
||||||
from bb import data
|
from bb import data
|
||||||
from bb.fetch import Fetch
|
from bb.fetch import Fetch
|
||||||
|
|
||||||
|
@ -47,7 +48,7 @@ class Local(Fetch):
|
||||||
if path[0] != "/":
|
if path[0] != "/":
|
||||||
filespath = data.getVar('FILESPATH', d, 1)
|
filespath = data.getVar('FILESPATH', d, 1)
|
||||||
if filespath:
|
if filespath:
|
||||||
newpath = bb.which(filespath, path)
|
newpath = bb.utils.which(filespath, path)
|
||||||
if not newpath:
|
if not newpath:
|
||||||
filesdir = data.getVar('FILESDIR', d, 1)
|
filesdir = data.getVar('FILESDIR', d, 1)
|
||||||
if filesdir:
|
if filesdir:
|
||||||
|
|
|
@ -30,6 +30,7 @@ import bb
|
||||||
from bb import data
|
from bb import data
|
||||||
from bb.fetch import Fetch
|
from bb.fetch import Fetch
|
||||||
from bb.fetch import FetchError
|
from bb.fetch import FetchError
|
||||||
|
from bb.fetch import encodeurl, decodeurl
|
||||||
|
|
||||||
class Wget(Fetch):
|
class Wget(Fetch):
|
||||||
"""Class to fetch urls via 'wget'"""
|
"""Class to fetch urls via 'wget'"""
|
||||||
|
@ -41,7 +42,7 @@ class Wget(Fetch):
|
||||||
|
|
||||||
def localpath(self, url, ud, d):
|
def localpath(self, url, ud, d):
|
||||||
|
|
||||||
url = bb.encodeurl([ud.type, ud.host, ud.path, ud.user, ud.pswd, {}])
|
url = encodeurl([ud.type, ud.host, ud.path, ud.user, ud.pswd, {}])
|
||||||
ud.basename = os.path.basename(ud.path)
|
ud.basename = os.path.basename(ud.path)
|
||||||
ud.localfile = data.expand(os.path.basename(url), d)
|
ud.localfile = data.expand(os.path.basename(url), d)
|
||||||
|
|
||||||
|
@ -60,7 +61,7 @@ class Wget(Fetch):
|
||||||
fetchcmd = data.getVar("FETCHCOMMAND", d, 1)
|
fetchcmd = data.getVar("FETCHCOMMAND", d, 1)
|
||||||
|
|
||||||
uri = uri.split(";")[0]
|
uri = uri.split(";")[0]
|
||||||
uri_decoded = list(bb.decodeurl(uri))
|
uri_decoded = list(decodeurl(uri))
|
||||||
uri_type = uri_decoded[0]
|
uri_type = uri_decoded[0]
|
||||||
uri_host = uri_decoded[1]
|
uri_host = uri_decoded[1]
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
import bb, os
|
import bb, os
|
||||||
|
import bb.utils
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import sqlite3
|
import sqlite3
|
||||||
|
@ -49,7 +50,7 @@ class PersistData:
|
||||||
try:
|
try:
|
||||||
os.stat(self.cachedir)
|
os.stat(self.cachedir)
|
||||||
except OSError:
|
except OSError:
|
||||||
bb.mkdirhier(self.cachedir)
|
bb.utils.mkdirhier(self.cachedir)
|
||||||
|
|
||||||
self.cachefile = os.path.join(self.cachedir,"bb_persist_data.sqlite3")
|
self.cachefile = os.path.join(self.cachedir,"bb_persist_data.sqlite3")
|
||||||
bb.msg.debug(1, bb.msg.domain.PersistData, "Using '%s' as the persistent data cache" % self.cachefile)
|
bb.msg.debug(1, bb.msg.domain.PersistData, "Using '%s' as the persistent data cache" % self.cachefile)
|
||||||
|
|
Loading…
Reference in New Issue