[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4375/8267] wic: isoimage-isohybrid: stop using HDDDIR

[Emmanuele Bassi <ebassi src gnome org>]

commit 8a04795db6ac2f5bd9d64f2dd878a9da209f508a
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Jan 12 19:00:10 2017 +0200

    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>

 .../lib/wic/plugins/source/isoimage-isohybrid.py   |   10 ++--------
 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 fd25190..a637ce5 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):
         part.rootfs_dir = rootfs_dir
 
         # Prepare rootfs.img
-        hdd_dir = get_bitbake_var("HDDDIR")
         img_iso_dir = get_bitbake_var("ISODIR")
-
-        rootfs_img = "%s/rootfs.img" % hdd_dir
-        if not os.path.isfile(rootfs_img):
-            rootfs_img = "%s/rootfs.img" % img_iso_dir
+        rootfs_img = "%s/rootfs.img" % img_iso_dir
         if not os.path.isfile(rootfs_img):
             # check if rootfs.img is in deploydir
             deploy_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
@@ -283,9 +279,7 @@ class IsoImagePlugin(SourcePlugin):
             os.remove(part.source_file)
 
         # Prepare initial ramdisk
-        initrd = "%s/initrd" % hdd_dir
-        if not os.path.isfile(initrd):
-            initrd = "%s/initrd" % img_iso_dir
+        initrd = "%s/initrd" % img_iso_dir
         if not os.path.isfile(initrd):
             initrd = cls._build_initramfs_path(rootfs_dir, cr_workdir)