Patchwork [bitbake-devel] bitbake: cooker: some IMAGE_FEATURES not recognized

login
register
mail settings
Submitter Marius Avram
Date March 12, 2014, 12:03 p.m.
Message ID <1394625829-11427-1-git-send-email-marius.avram@intel.com>
Download mbox | patch
Permalink /patch/68509/
State New
Headers show

Comments

Marius Avram - March 12, 2014, 12:03 p.m.
Fixes an issue in hob which happened when the local.conf file was
modified externally by appending "eclipse-debug" to the IMAGE_FEATURES
variable. The reason of the problem is that some IMAGE_FEATURES are
not available in the image.bbclass file and they are declared in the
core-image.bbclass. Now a default hob image will inherit core-image.

[YOCTO #5711]

Signed-off-by: Marius Avram <marius.avram@intel.com>
---
 bitbake/lib/bb/cooker.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Paul Eggleton - March 14, 2014, 2:19 p.m.
On Wednesday 12 March 2014 14:03:49 Marius Avram wrote:
> Fixes an issue in hob which happened when the local.conf file was
> modified externally by appending "eclipse-debug" to the IMAGE_FEATURES
> variable. The reason of the problem is that some IMAGE_FEATURES are
> not available in the image.bbclass file and they are declared in the
> core-image.bbclass. Now a default hob image will inherit core-image.
> 
> [YOCTO #5711]
> 
> Signed-off-by: Marius Avram <marius.avram@intel.com>
> ---
>  bitbake/lib/bb/cooker.py |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
> index 96f05b5..4de6a51 100644
> --- a/bitbake/lib/bb/cooker.py
> +++ b/bitbake/lib/bb/cooker.py
> @@ -1220,7 +1220,7 @@ class BBCooker:
> 
>          with open(dest, "w") as imagefile:
>              if base_image is None:
> -                imagefile.write("inherit image\n")
> +                imagefile.write("inherit core-image\n")
>              else:
>                  topdir = self.data.getVar("TOPDIR")
>                  if topdir in base_image:

Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Patch

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 96f05b5..4de6a51 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1220,7 +1220,7 @@  class BBCooker:
 
         with open(dest, "w") as imagefile:
             if base_image is None:
-                imagefile.write("inherit image\n")
+                imagefile.write("inherit core-image\n")
             else:
                 topdir = self.data.getVar("TOPDIR")
                 if topdir in base_image: