summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-02-09 16:48:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-15 20:06:45 -0800
commit417e5fbe2bde800d5ea9647f48034979dc4cd2c3 (patch)
treee4390cc18313416bb43e463e40ad011c4cb94b18 /scripts/lib/wic
parent6d91c5f6f43e71ea8a4b0ba3015dd450d41aaeff (diff)
downloadpoky-417e5fbe2bde800d5ea9647f48034979dc4cd2c3.tar.gz
wic: direct: remove set_bootimg_dir setter
Removed java-like setter set_bootimg_dir. It's more pythonic to access public attributes directly. (From OE-Core rev: c2a6ca4883ea59e6492ad3b4aa0e9bc358b87fed) 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')
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py9
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py2
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py2
3 files changed, 2 insertions, 11 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 12044318e8..a2bc4c4144 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -149,15 +149,6 @@ class DirectPlugin(ImagerPlugin):
149 149
150 return updated 150 return updated
151 151
152 def set_bootimg_dir(self, bootimg_dir):
153 """
154 Accessor for bootimg_dir, the actual location used for the source
155 of the bootimg. Should be set by source plugins (only if they
156 change the default bootimg source) so the correct info gets
157 displayed for print_outimage_info().
158 """
159 self.bootimg_dir = bootimg_dir
160
161 def _full_path(self, path, name, extention): 152 def _full_path(self, path, name, extention):
162 """ Construct full file path to a file we generate. """ 153 """ Construct full file path to a file we generate. """
163 return os.path.join(path, "%s-%s.%s" % (self.name, name, extention)) 154 return os.path.join(path, "%s-%s.%s" % (self.name, name, extention))
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index dd6c920267..95316c80c0 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -187,7 +187,7 @@ class BootimgEFIPlugin(SourcePlugin):
187 if not bootimg_dir: 187 if not bootimg_dir:
188 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") 188 msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
189 # just so the result notes display it 189 # just so the result notes display it
190 creator.set_bootimg_dir(bootimg_dir) 190 creator.bootimg_dir = bootimg_dir
191 191
192 staging_kernel_dir = kernel_dir 192 staging_kernel_dir = kernel_dir
193 193
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 0be2b78e51..e5f6a328ed 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -151,7 +151,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
151 if not _has_syslinux(bootimg_dir): 151 if not _has_syslinux(bootimg_dir):
152 msger.error("Please build syslinux first\n") 152 msger.error("Please build syslinux first\n")
153 # just so the result notes display it 153 # just so the result notes display it
154 creator.set_bootimg_dir(bootimg_dir) 154 creator.bootimg_dir = bootimg_dir
155 155
156 staging_kernel_dir = kernel_dir 156 staging_kernel_dir = kernel_dir
157 157