Patchwork [bitbake-devel,PATCH_V3,09/16] hob/bitbake: when an image is saved, it should require an image from layers

login
register
mail settings
Submitter Cristiana Voicu
Date July 29, 2013, 12:59 p.m.
Message ID <1375102770-14079-10-git-send-email-cristiana.voicu@intel.com>
Download mbox | patch
Permalink /patch/54711/
State New
Headers show

Comments

Cristiana Voicu - July 29, 2013, 12:59 p.m.
Saving an image that requires another image will cause issues when
the second on is removed. So, we have agreed to "require" only the images
from layers.
The functionality is implemented in bitbake, in order to be more abstract,
and it is used by Hob when an image recipe is saved.

[YOCTO #4193]
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 bitbake/lib/bb/cooker.py |    7 +++++++
 1 file changed, 7 insertions(+)

Patch

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a4a6be6..f009210 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1143,10 +1143,17 @@  class BBCooker:
             else:
                 dest = image
 
+        if base_image:
+            with open(base_image, 'r') as f:
+                require_line = f.readline()
+
         with open(dest, "w") as imagefile:
             if base_image is None:
                 imagefile.write("inherit image\n")
             else:
+                topdir = self.data.getVar("TOPDIR")
+                if topdir in base_image:
+                    base_image = require_line.split()[1]
                 imagefile.write("require " + base_image + "\n")
             package_install = "PACKAGE_INSTALL_forcevariable = \""
             for package in package_queue: