From 28296ca78507ba2e414eb136c81afee65a8e25e5 Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Thu, 25 Jul 2013 07:45:28 +0000 Subject: [PATCH] hob/bitbake: when an image is saved, it should require an image from layers 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 Signed-off-by: Richard Purdie --- lib/bb/cooker.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index a4a6be658d3..f009210f755 100644 --- a/lib/bb/cooker.py +++ b/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: -- 2.47.3