aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 11:06:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-03 11:06:04 +0000
commit9c3fbc7b2964f001f2dd49b6efd98ba9a42528ad (patch)
tree37fa8e3ced001624bf651c348135c14f496eb7e5
parent4a480a052f450c4ee061ab0e60a495a45f140cf9 (diff)
downloadbitbake-9c3fbc7b2964f001f2dd49b6efd98ba9a42528ad.tar.gz
bitbake-9c3fbc7b2964f001f2dd49b6efd98ba9a42528ad.tar.bz2
bitbake-9c3fbc7b2964f001f2dd49b6efd98ba9a42528ad.zip
conf/classes: Catch up with bb.data -> direct object access conversion
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--classes/base.bbclass6
-rw-r--r--conf/bitbake.conf10
-rw-r--r--lib/bb/cooker.py2
3 files changed, 9 insertions, 9 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index c6693ce31..444b830b6 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -43,8 +43,8 @@ python do_showdata() {
bb.data.emit_env(sys.__stdout__, d, True)
# emit the metadata which isnt valid shell
for e in bb.data.keys(d):
- if bb.data.getVarFlag(e, 'python', d):
- sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, bb.data.getVar(e, d, 1)))
+ if d.getVarFlag(e, 'python'):
+ sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, d.getVar(e, 1)))
}
addtask listtasks
@@ -52,7 +52,7 @@ do_listtasks[nostamp] = "1"
python do_listtasks() {
import sys
for e in bb.data.keys(d):
- if bb.data.getVarFlag(e, 'task', d):
+ if d.getVarFlag(e, 'task'):
sys.__stdout__.write("%s\n" % e)
}
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index b0c06a83b..1ee4dc5aa 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -28,9 +28,9 @@ FETCHCOMMAND = ""
FETCHCOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} co ${CVSCOOPTS} ${CVSMODULE}"
FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
-FILESDIR = "${@bb.utils.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
+FILESDIR = "${@bb.utils.which(d.getVar('FILESPATH', 1), '.')}"
FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
-FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
+FILE_DIRNAME = "${@os.path.dirname(d.getVar('FILE'))}"
GITDIR = "${DL_DIR}/git"
IMAGE_CMD = "_NO_DEFINED_IMAGE_TYPES_"
IMAGE_ROOTFS = "${TMPDIR}/rootfs"
@@ -40,10 +40,10 @@ OVERRIDES = "local:${MACHINE}:${TARGET_OS}:${TARGET_ARCH}"
P = "${PN}-${PV}"
PERSISTENT_DIR = "${TMPDIR}/cache"
PF = "${PN}-${PV}-${PR}"
-PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}"
-PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
+PN = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[0] or 'defaultpkgname'}"
+PR = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[2] or 'r0'}"
PROVIDES = ""
-PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}"
+PV = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE'),d)[1] or '1.0'}"
RESUMECOMMAND = ""
RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}"
S = "${WORKDIR}/${P}"
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 558eadd00..bf8389a99 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -178,7 +178,7 @@ class BBCooker:
self.configuration.data = bb.data.init()
if not self.server_registration_cb:
- bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data)
+ self.configuration.data.setVar("BB_WORKERCONTEXT", "1")
filtered_keys = bb.utils.approved_variables()
bb.data.inheritFromOS(self.configuration.data, self.savedenv, filtered_keys)