summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-12 19:00:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-31 14:38:32 +0000
commit8a04795db6ac2f5bd9d64f2dd878a9da209f508a (patch)
tree5938e8be55bde5af5e1b335af05cfc0bcc93fb5d
parenta508cb384c00d7ce5770f16c2523a3f05eb799a4 (diff)
downloadpoky-8a04795db6ac2f5bd9d64f2dd878a9da209f508a.tar.gz
wic: isoimage-isohybrid: stop using HDDDIR
Stop using HDDDIR in isoimage-isohybrid wic plugin. This variable is set by hddimg code, which is going to be removed soon. All required artifacts should be available from ISODIR. wic-image.bbclass has been modified to build iso artifacts, so it should be safe to remove usage of HDDDIR. [YOCTO #10835] (From OE-Core rev: 4ceb0df10db7254b290784cabc5279ffa2b946a4) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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