diff options
| -rw-r--r-- | bitbake/lib/bb/build.py | 7 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch/local.py | 3 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch/wget.py | 5 | ||||
| -rw-r--r-- | bitbake/lib/bb/persist_data.py | 3 |
4 files changed, 11 insertions, 7 deletions
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py index 1882733a5..3d7101399 100644 --- a/bitbake/lib/bb/build.py +++ b/bitbake/lib/bb/build.py @@ -27,6 +27,7 @@ from bb import data, event, mkdirhier, utils import bb, os, sys +import bb.utils # When we execute a python function we'd like certain things # in all namespaces, hence we add them to __builtins__ @@ -107,7 +108,7 @@ def exec_func(func, d, dirs = None): else: dirs = (data.expand(flags['dirs'], d) or "").split() for adir in dirs: - mkdirhier(adir) + bb.utils.mkdirhier(adir) if len(dirs) > 0: adir = dirs[-1] @@ -124,7 +125,7 @@ def exec_func(func, d, dirs = None): t = data.getVar('T', d, 1) if not t: 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())) runfile = "%s/run.%s.%s" % (t, func, str(os.getpid())) @@ -320,7 +321,7 @@ def stamp_internal(task, d, file_name): if not stamp: return 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 # change on broken NFS filesystems if os.access(stamp, os.F_OK): diff --git a/bitbake/lib/bb/fetch/local.py b/bitbake/lib/bb/fetch/local.py index a2abc8639..882a2c460 100644 --- a/bitbake/lib/bb/fetch/local.py +++ b/bitbake/lib/bb/fetch/local.py @@ -27,6 +27,7 @@ BitBake build tools. import os import bb +import bb.utils from bb import data from bb.fetch import Fetch @@ -47,7 +48,7 @@ class Local(Fetch): if path[0] != "/": filespath = data.getVar('FILESPATH', d, 1) if filespath: - newpath = bb.which(filespath, path) + newpath = bb.utils.which(filespath, path) if not newpath: filesdir = data.getVar('FILESDIR', d, 1) if filesdir: diff --git a/bitbake/lib/bb/fetch/wget.py b/bitbake/lib/bb/fetch/wget.py index ae1c6ad13..8b687372a 100644 --- a/bitbake/lib/bb/fetch/wget.py +++ b/bitbake/lib/bb/fetch/wget.py @@ -30,6 +30,7 @@ import bb from bb import data from bb.fetch import Fetch from bb.fetch import FetchError +from bb.fetch import encodeurl, decodeurl class Wget(Fetch): """Class to fetch urls via 'wget'""" @@ -41,7 +42,7 @@ class Wget(Fetch): 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.localfile = data.expand(os.path.basename(url), d) @@ -60,7 +61,7 @@ class Wget(Fetch): fetchcmd = data.getVar("FETCHCOMMAND", d, 1) uri = uri.split(";")[0] - uri_decoded = list(bb.decodeurl(uri)) + uri_decoded = list(decodeurl(uri)) uri_type = uri_decoded[0] uri_host = uri_decoded[1] diff --git a/bitbake/lib/bb/persist_data.py b/bitbake/lib/bb/persist_data.py index e2bbbe54f..a26244510 100644 --- a/bitbake/lib/bb/persist_data.py +++ b/bitbake/lib/bb/persist_data.py @@ -16,6 +16,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import bb, os +import bb.utils try: import sqlite3 @@ -49,7 +50,7 @@ class PersistData: try: os.stat(self.cachedir) except OSError: - bb.mkdirhier(self.cachedir) + bb.utils.mkdirhier(self.cachedir) 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) |