diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-01-14 14:12:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 11:47:06 +0000 |
commit | 5cd222b19f1a937ecc10de5db04d954d3c11eff5 (patch) | |
tree | 6c4b0ceb07b3b48814d43ea65d79000f98728e48 /scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |
parent | 4d5d5dd428e8d8fa0e155988286f3b45f47e1544 (diff) | |
download | poky-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/isoimage-isohybrid.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 9ad0bc7c9b..b5ca4d39f6 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -262,26 +262,26 @@ class IsoImagePlugin(SourcePlugin): | |||
262 | 262 | ||
263 | isodir = "%s/ISO" % cr_workdir | 263 | isodir = "%s/ISO" % cr_workdir |
264 | 264 | ||
265 | if part.rootfs is None: | 265 | if part.rootfs_dir is None: |
266 | if not 'ROOTFS_DIR' in rootfs_dir: | 266 | if not 'ROOTFS_DIR' in rootfs_dir: |
267 | msger.error("Couldn't find --rootfs-dir, exiting.\n") | 267 | msger.error("Couldn't find --rootfs-dir, exiting.\n") |
268 | rootfs_dir = rootfs_dir['ROOTFS_DIR'] | 268 | rootfs_dir = rootfs_dir['ROOTFS_DIR'] |
269 | else: | 269 | else: |
270 | if part.rootfs in rootfs_dir: | 270 | if part.rootfs_dir in rootfs_dir: |
271 | rootfs_dir = rootfs_dir[part.rootfs] | 271 | rootfs_dir = rootfs_dir[part.rootfs_dir] |
272 | elif part.rootfs: | 272 | elif part.rootfs_dir: |
273 | rootfs_dir = part.rootfs | 273 | rootfs_dir = part.rootfs_dir |
274 | else: | 274 | else: |
275 | msg = "Couldn't find --rootfs-dir=%s connection " | 275 | msg = "Couldn't find --rootfs-dir=%s connection " |
276 | msg += "or it is not a valid path, exiting.\n" | 276 | msg += "or it is not a valid path, exiting.\n" |
277 | msger.error(msg % part.rootfs) | 277 | msger.error(msg % part.rootfs_dir) |
278 | 278 | ||
279 | if not os.path.isdir(rootfs_dir): | 279 | if not os.path.isdir(rootfs_dir): |
280 | rootfs_dir = get_bitbake_var("IMAGE_ROOTFS") | 280 | rootfs_dir = get_bitbake_var("IMAGE_ROOTFS") |
281 | if not os.path.isdir(rootfs_dir): | 281 | if not os.path.isdir(rootfs_dir): |
282 | msger.error("Couldn't find IMAGE_ROOTFS, exiting.\n") | 282 | msger.error("Couldn't find IMAGE_ROOTFS, exiting.\n") |
283 | 283 | ||
284 | part.set_rootfs(rootfs_dir) | 284 | part.rootfs_dir = rootfs_dir |
285 | 285 | ||
286 | # Prepare rootfs.img | 286 | # Prepare rootfs.img |
287 | hdd_dir = get_bitbake_var("HDDDIR") | 287 | hdd_dir = get_bitbake_var("HDDDIR") |