summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/plugins/source/rootfs.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-01-14 14:12:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:06 +0000
commit5cd222b19f1a937ecc10de5db04d954d3c11eff5 (patch)
tree6c4b0ceb07b3b48814d43ea65d79000f98728e48 /scripts/lib/wic/plugins/source/rootfs.py
parent4d5d5dd428e8d8fa0e155988286f3b45f47e1544 (diff)
downloadpoky-5cd222b19f1a937ecc10de5db04d954d3c11eff5.tar.gz
wic: get rid of get_rootfs and set_rootfs
Got rid of get_rootfs and set_rootfs java-like getter and setter. Renamed rootfs to rootfs_dir to be consistent with the name of kickstart parameter --rootfs-dir. (From OE-Core rev: 51ec52a62ce49d1a1a83489379990f78cfe849f9) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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