[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7020/8267] wic: use absolute paths in rootfs plugin

[Emmanuele Bassi <ebassi src gnome org>]

commit 5541191b9987ea194bcb55a913cf92f6f3679b42
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Fri Jul 28 12:29:24 2017 +0300

    wic: use absolute paths in rootfs plugin
    
    Using relative paths can cause copyhardlinktree API to fail as
    it changes current directory when working. Converted all paths
    to absolute paths using os.path.realpath.
    
    (From OE-Core rev: a1c83cebe986e211dfc31be5cbd748f53fc298df)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/source/rootfs.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 4dc4cb8..c08f760 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -48,7 +48,7 @@ class RootfsPlugin(SourcePlugin):
     @staticmethod
     def __get_rootfs_dir(rootfs_dir):
         if os.path.isdir(rootfs_dir):
-            return rootfs_dir
+            return os.path.realpath(rootfs_dir)
 
         image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir)
         if not os.path.isdir(image_rootfs_dir):
@@ -56,7 +56,7 @@ class RootfsPlugin(SourcePlugin):
                            "named %s has been found at %s, exiting." %
                            (rootfs_dir, image_rootfs_dir))
 
-        return image_rootfs_dir
+        return os.path.realpath(image_rootfs_dir)
 
     @classmethod
     def do_prepare_partition(cls, part, source_params, cr, cr_workdir,