diff options
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/template.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 7b6c116ee4..4135d74865 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py | |||
@@ -75,7 +75,7 @@ class Configuration: | |||
75 | self.sstatedir = template.getVar("SSTATE_DIR") | 75 | self.sstatedir = template.getVar("SSTATE_DIR") |
76 | self.sstatemirror = template.getVar("SSTATE_MIRROR") | 76 | self.sstatemirror = template.getVar("SSTATE_MIRROR") |
77 | self.pmake = int(template.getVar("PARALLEL_MAKE").split()[1]) | 77 | self.pmake = int(template.getVar("PARALLEL_MAKE").split()[1]) |
78 | self.bbthread = int(template.getVar("BB_NUMBER_THREAD")) | 78 | self.bbthread = int(template.getVar("BB_NUMBER_THREADS")) |
79 | self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE")) | 79 | self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE")) |
80 | self.image_extra_size = int(template.getVar("IMAGE_EXTRA_SPACE")) | 80 | self.image_extra_size = int(template.getVar("IMAGE_EXTRA_SPACE")) |
81 | # image_overhead_factor is read-only. | 81 | # image_overhead_factor is read-only. |
@@ -103,7 +103,7 @@ class Configuration: | |||
103 | template.setVar("SSTATE_DIR", self.sstatedir) | 103 | template.setVar("SSTATE_DIR", self.sstatedir) |
104 | template.setVar("SSTATE_MIRROR", self.sstatemirror) | 104 | template.setVar("SSTATE_MIRROR", self.sstatemirror) |
105 | template.setVar("PARALLEL_MAKE", "-j %s" % self.pmake) | 105 | template.setVar("PARALLEL_MAKE", "-j %s" % self.pmake) |
106 | template.setVar("BB_NUMBER_THREAD", self.bbthread) | 106 | template.setVar("BB_NUMBER_THREADS", self.bbthread) |
107 | template.setVar("PACKAGE_CLASSES", " ".join(["package_" + i for i in self.curr_package_format.split()])) | 107 | template.setVar("PACKAGE_CLASSES", " ".join(["package_" + i for i in self.curr_package_format.split()])) |
108 | template.setVar("IMAGE_ROOTFS_SIZE", self.image_rootfs_size) | 108 | template.setVar("IMAGE_ROOTFS_SIZE", self.image_rootfs_size) |
109 | template.setVar("IMAGE_EXTRA_SPACE", self.image_extra_size) | 109 | template.setVar("IMAGE_EXTRA_SPACE", self.image_extra_size) |
diff --git a/bitbake/lib/bb/ui/crumbs/template.py b/bitbake/lib/bb/ui/crumbs/template.py index a03063c4ff..5679c18f76 100644 --- a/bitbake/lib/bb/ui/crumbs/template.py +++ b/bitbake/lib/bb/ui/crumbs/template.py | |||
@@ -125,7 +125,7 @@ class RecipeFile(ConfigFile): | |||
125 | 125 | ||
126 | class TemplateMgr(gobject.GObject): | 126 | class TemplateMgr(gobject.GObject): |
127 | 127 | ||
128 | __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREAD", "CONF_VERSION"] | 128 | __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREADS", "CONF_VERSION"] |
129 | __gBBLayersVars__ = ["BBLAYERS", "LCONF_VERSION"] | 129 | __gBBLayersVars__ = ["BBLAYERS", "LCONF_VERSION"] |
130 | __gRecipeVars__ = ["DEPENDS", "IMAGE_INSTALL"] | 130 | __gRecipeVars__ = ["DEPENDS", "IMAGE_INSTALL"] |
131 | 131 | ||