summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/imager
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@linux.intel.com>2014-10-29 17:04:23 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-30 13:03:41 +0000
commit42d0334aa8bf59937262f957f2ea04abc271138b (patch)
tree1b8b5b948c3b711eb9bd666e1e25c2a03b86d917 /scripts/lib/wic/imager
parent38400617febd61a1594969c86a6f1712a9d80516 (diff)
downloadpoky-42d0334aa8bf59937262f957f2ea04abc271138b.tar.gz
wic: Remove special-case bootimg_dir
The first iterations of wic very shortsightedly catered to two specific use-cases and added special-purpose params for those cases so that they could be directly given their corresponding boot artifacts. (hdddir and staging_data_dir). As more use-cases are added, it becomes rather obvious that such a scheme doens't scale, and additionally causes confusion for plugin writers. This removes those special cases and states explicitly in the help text that plugins are responsible for locating their own boot artifacts. (From OE-Core rev: 6ba3eb5ff7c47aee6b3419fb3a348a634fe74ac9) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/imager')
-rw-r--r--scripts/lib/wic/imager/direct.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index 5b12856289..6b2ab3368e 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -52,8 +52,7 @@ class DirectImageCreator(BaseImageCreator):
52 """ 52 """
53 53
54 def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir, 54 def __init__(self, oe_builddir, image_output_dir, rootfs_dir, bootimg_dir,
55 kernel_dir, native_sysroot, hdddir, staging_data_dir, 55 kernel_dir, native_sysroot, creatoropts=None):
56 creatoropts=None):
57 """ 56 """
58 Initialize a DirectImageCreator instance. 57 Initialize a DirectImageCreator instance.
59 58
@@ -74,8 +73,6 @@ class DirectImageCreator(BaseImageCreator):
74 self.bootimg_dir = bootimg_dir 73 self.bootimg_dir = bootimg_dir
75 self.kernel_dir = kernel_dir 74 self.kernel_dir = kernel_dir
76 self.native_sysroot = native_sysroot 75 self.native_sysroot = native_sysroot
77 self.hdddir = hdddir
78 self.staging_data_dir = staging_data_dir
79 76
80 def __write_fstab(self, image_rootfs): 77 def __write_fstab(self, image_rootfs):
81 """overriden to generate fstab (temporarily) in rootfs. This is called 78 """overriden to generate fstab (temporarily) in rootfs. This is called