summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index fd251908d2..a637ce5025 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -249,12 +249,8 @@ class IsoImagePlugin(SourcePlugin):
249 part.rootfs_dir = rootfs_dir 249 part.rootfs_dir = rootfs_dir
250 250
251 # Prepare rootfs.img 251 # Prepare rootfs.img
252 hdd_dir = get_bitbake_var("HDDDIR")
253 img_iso_dir = get_bitbake_var("ISODIR") 252 img_iso_dir = get_bitbake_var("ISODIR")
254 253 rootfs_img = "%s/rootfs.img" % img_iso_dir
255 rootfs_img = "%s/rootfs.img" % hdd_dir
256 if not os.path.isfile(rootfs_img):
257 rootfs_img = "%s/rootfs.img" % img_iso_dir
258 if not os.path.isfile(rootfs_img): 254 if not os.path.isfile(rootfs_img):
259 # check if rootfs.img is in deploydir 255 # check if rootfs.img is in deploydir
260 deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") 256 deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
@@ -283,9 +279,7 @@ class IsoImagePlugin(SourcePlugin):
283 os.remove(part.source_file) 279 os.remove(part.source_file)
284 280
285 # Prepare initial ramdisk 281 # Prepare initial ramdisk
286 initrd = "%s/initrd" % hdd_dir 282 initrd = "%s/initrd" % img_iso_dir
287 if not os.path.isfile(initrd):
288 initrd = "%s/initrd" % img_iso_dir
289 if not os.path.isfile(initrd): 283 if not os.path.isfile(initrd):
290 initrd = cls._build_initramfs_path(rootfs_dir, cr_workdir) 284 initrd = cls._build_initramfs_path(rootfs_dir, cr_workdir)
291 285