summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a4a6be658d..f009210f75 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1143,10 +1143,17 @@ class BBCooker:
1143 else: 1143 else:
1144 dest = image 1144 dest = image
1145 1145
1146 if base_image:
1147 with open(base_image, 'r') as f:
1148 require_line = f.readline()
1149
1146 with open(dest, "w") as imagefile: 1150 with open(dest, "w") as imagefile:
1147 if base_image is None: 1151 if base_image is None:
1148 imagefile.write("inherit image\n") 1152 imagefile.write("inherit image\n")
1149 else: 1153 else:
1154 topdir = self.data.getVar("TOPDIR")
1155 if topdir in base_image:
1156 base_image = require_line.split()[1]
1150 imagefile.write("require " + base_image + "\n") 1157 imagefile.write("require " + base_image + "\n")
1151 package_install = "PACKAGE_INSTALL_forcevariable = \"" 1158 package_install = "PACKAGE_INSTALL_forcevariable = \""
1152 for package in package_queue: 1159 for package in package_queue: