Patchwork [bitbake-devel] Fix typo: BB_NUMBER_THREAD -> BB_NUMBER_THREADS

login
mail settings
Submitter Robert P. J. Day
Date March 22, 2012, 7:54 p.m.
Message ID <alpine.DEB.2.02.1203221552180.21491@oneiric>
Download mbox | patch
Permalink /patch/24183/
State New
Headers show

Comments

Robert P. J. Day - March 22, 2012, 7:54 p.m.
Correct some apparent misspellings of BB_NUMBER_THREADS.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---
Dongxiao Xu - March 24, 2012, 12:11 a.m.
On Thu, 2012-03-22 at 15:54 -0400, Robert P. J. Day wrote:
> Correct some apparent misspellings of BB_NUMBER_THREADS.
> 
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

Actually these are Hob self-defined variables in its template, and it
will not impact the functionality. But definitely we missed the 's' in
BB_NUMBER_THREADS. Thanks for finding that.

Acked-by: Dongxiao Xu <dongxiao.xu@intel.com>

> 
> ---
> 
> diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py
> index 5a292e7..619f1d4 100755
> --- a/lib/bb/ui/crumbs/builder.py
> +++ b/lib/bb/ui/crumbs/builder.py
> @@ -75,7 +75,7 @@ class Configuration:
>          self.sstatedir = template.getVar("SSTATE_DIR")
>          self.sstatemirror = template.getVar("SSTATE_MIRROR")
>          self.pmake = int(template.getVar("PARALLEL_MAKE").split()[1])
> -        self.bbthread = int(template.getVar("BB_NUMBER_THREAD"))
> +        self.bbthread = int(template.getVar("BB_NUMBER_THREADS"))
>          self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE"))
>          self.image_extra_size = int(template.getVar("IMAGE_EXTRA_SPACE"))
>          # image_overhead_factor is read-only.
> @@ -103,7 +103,7 @@ class Configuration:
>          template.setVar("SSTATE_DIR", self.sstatedir)
>          template.setVar("SSTATE_MIRROR", self.sstatemirror)
>          template.setVar("PARALLEL_MAKE", "-j %s" % self.pmake)
> -        template.setVar("BB_NUMBER_THREAD", self.bbthread)
> +        template.setVar("BB_NUMBER_THREADS", self.bbthread)
>          template.setVar("PACKAGE_CLASSES", " ".join(["package_" + i for i in self.curr_package_format.split()]))
>          template.setVar("IMAGE_ROOTFS_SIZE", self.image_rootfs_size)
>          template.setVar("IMAGE_EXTRA_SPACE", self.image_extra_size)
> diff --git a/lib/bb/ui/crumbs/template.py b/lib/bb/ui/crumbs/template.py
> index a03063c..5679c18 100644
> --- a/lib/bb/ui/crumbs/template.py
> +++ b/lib/bb/ui/crumbs/template.py
> @@ -125,7 +125,7 @@ class RecipeFile(ConfigFile):
> 
>  class TemplateMgr(gobject.GObject):
> 
> -    __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREAD", "CONF_VERSION"]
> +    __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREADS", "CONF_VERSION"]
>      __gBBLayersVars__ = ["BBLAYERS", "LCONF_VERSION"]
>      __gRecipeVars__ = ["DEPENDS", "IMAGE_INSTALL"]
> 
>

Patch

diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py
index 5a292e7..619f1d4 100755
--- a/lib/bb/ui/crumbs/builder.py
+++ b/lib/bb/ui/crumbs/builder.py
@@ -75,7 +75,7 @@  class Configuration:
         self.sstatedir = template.getVar("SSTATE_DIR")
         self.sstatemirror = template.getVar("SSTATE_MIRROR")
         self.pmake = int(template.getVar("PARALLEL_MAKE").split()[1])
-        self.bbthread = int(template.getVar("BB_NUMBER_THREAD"))
+        self.bbthread = int(template.getVar("BB_NUMBER_THREADS"))
         self.image_rootfs_size = int(template.getVar("IMAGE_ROOTFS_SIZE"))
         self.image_extra_size = int(template.getVar("IMAGE_EXTRA_SPACE"))
         # image_overhead_factor is read-only.
@@ -103,7 +103,7 @@  class Configuration:
         template.setVar("SSTATE_DIR", self.sstatedir)
         template.setVar("SSTATE_MIRROR", self.sstatemirror)
         template.setVar("PARALLEL_MAKE", "-j %s" % self.pmake)
-        template.setVar("BB_NUMBER_THREAD", self.bbthread)
+        template.setVar("BB_NUMBER_THREADS", self.bbthread)
         template.setVar("PACKAGE_CLASSES", " ".join(["package_" + i for i in self.curr_package_format.split()]))
         template.setVar("IMAGE_ROOTFS_SIZE", self.image_rootfs_size)
         template.setVar("IMAGE_EXTRA_SPACE", self.image_extra_size)
diff --git a/lib/bb/ui/crumbs/template.py b/lib/bb/ui/crumbs/template.py
index a03063c..5679c18 100644
--- a/lib/bb/ui/crumbs/template.py
+++ b/lib/bb/ui/crumbs/template.py
@@ -125,7 +125,7 @@  class RecipeFile(ConfigFile):

 class TemplateMgr(gobject.GObject):

-    __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREAD", "CONF_VERSION"]
+    __gLocalVars__ = ["MACHINE", "PACKAGE_CLASSES", "DISTRO", "DL_DIR", "SSTATE_DIR", "SSTATE_MIRROR", "PARALLEL_MAKE", "BB_NUMBER_THREADS", "CONF_VERSION"]
     __gBBLayersVars__ = ["BBLAYERS", "LCONF_VERSION"]
     __gRecipeVars__ = ["DEPENDS", "IMAGE_INSTALL"]