summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/rootfs.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/lib/wic/plugins/source/rootfs.py')
-rw-r--r--scripts/lib/wic/plugins/source/rootfs.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index a90712b247..425da8b22a 100644
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -61,23 +61,23 @@ class RootfsPlugin(SourcePlugin):
61 'prepares' the partition to be incorporated into the image. 61 'prepares' the partition to be incorporated into the image.
62 In this case, prepare content for legacy bios boot partition. 62 In this case, prepare content for legacy bios boot partition.
63 """ 63 """
64 if part.rootfs is None: 64 if part.rootfs_dir is None:
65 if not 'ROOTFS_DIR' in krootfs_dir: 65 if not 'ROOTFS_DIR' in krootfs_dir:
66 msg = "Couldn't find --rootfs-dir, exiting" 66 msg = "Couldn't find --rootfs-dir, exiting"
67 msger.error(msg) 67 msger.error(msg)
68 rootfs_dir = krootfs_dir['ROOTFS_DIR'] 68 rootfs_dir = krootfs_dir['ROOTFS_DIR']
69 else: 69 else:
70 if part.rootfs in krootfs_dir: 70 if part.rootfs_dir in krootfs_dir:
71 rootfs_dir = krootfs_dir[part.rootfs] 71 rootfs_dir = krootfs_dir[part.rootfs_dir]
72 elif part.rootfs: 72 elif part.rootfs_dir:
73 rootfs_dir = part.rootfs 73 rootfs_dir = part.rootfs_dir
74 else: 74 else:
75 msg = "Couldn't find --rootfs-dir=%s connection" 75 msg = "Couldn't find --rootfs-dir=%s connection"
76 msg += " or it is not a valid path, exiting" 76 msg += " or it is not a valid path, exiting"
77 msger.error(msg % part.rootfs) 77 msger.error(msg % part.rootfs_dir)
78 78
79 real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) 79 real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
80 80
81 part.set_rootfs(real_rootfs_dir) 81 part.rootfs_dir = real_rootfs_dir
82 part.prepare_rootfs(cr_workdir, oe_builddir, real_rootfs_dir, native_sysroot) 82 part.prepare_rootfs(cr_workdir, oe_builddir, real_rootfs_dir, native_sysroot)
83 83