diff options
| author |   Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-02-03 19:16:59 -0600 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-04 12:56:55 +0000 |
| commit | 43558610a5793888ff2b18bd3a27c7ab558e5ad0 (patch) | |
| tree | c830c37238c83128b72240f76190e22227ba7046 /scripts/lib/mic/plugins/source | |
| parent | 6e147488b40f730e07f1e0f232083ed75388daa0 (diff) | |
| download | openembedded-core-43558610a5793888ff2b18bd3a27c7ab558e5ad0.tar.gz | |
wic: Hook up BootimgEFIPlugin and BootimgPcbiosPlugin plugins
Remove all the Wic_PartData and DirectImageCreator code now
implemented by the BootimgEFIPlugin and BootimgPcbiosPlugin plugins,
as well as all the special-cased boot_type code, significantly
cleaning up the code.
Replace the calling code with general-purpose plugin invocations, in
essence calling the appropriate implementations at run-time based on
the --source value in effect.
Change the directdisk.wks and mkefidisk.wks scripts to make use of the
new plugins.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/mic/plugins/source')
| -rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-efi.py | 6 | ||||
| -rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-pcbios.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/lib/mic/plugins/source/bootimg-efi.py b/scripts/lib/mic/plugins/source/bootimg-efi.py index f2bd071aff..3e0997bacf 100644 --- a/scripts/lib/mic/plugins/source/bootimg-efi.py +++ b/scripts/lib/mic/plugins/source/bootimg-efi.py @@ -107,7 +107,7 @@ class BootimgEFIPlugin(SourcePlugin): if not bootimg_dir: msger.error("Couldn't find HDDDIR, exiting\n") # just so the result notes display it - cr.bootimg_dir = bootimg_dir + cr.set_bootimg_dir(bootimg_dir) staging_kernel_dir = kernel_dir staging_data_dir = bootimg_dir @@ -155,7 +155,7 @@ class BootimgEFIPlugin(SourcePlugin): rc, out = exec_cmd(du_cmd) bootimg_size = out.split()[0] - part.size = bootimg_size - part.source_file = bootimg + part.set_size(bootimg_size) + part.set_source_file(bootimg) diff --git a/scripts/lib/mic/plugins/source/bootimg-pcbios.py b/scripts/lib/mic/plugins/source/bootimg-pcbios.py index 1da2a41fa7..3cd446f052 100644 --- a/scripts/lib/mic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/mic/plugins/source/bootimg-pcbios.py @@ -135,7 +135,7 @@ class BootimgPcbiosPlugin(SourcePlugin): if not bootimg_dir: msger.error("Couldn't find STAGING_DATADIR, exiting\n") # just so the result notes display it - cr.bootimg_dir = bootimg_dir + cr.set_bootimg_dir(bootimg_dir) staging_kernel_dir = kernel_dir staging_data_dir = bootimg_dir @@ -181,7 +181,7 @@ class BootimgPcbiosPlugin(SourcePlugin): rc, out = exec_cmd(du_cmd) bootimg_size = out.split()[0] - part.size = bootimg_size - part.source_file = bootimg + part.set_size(bootimg_size) + part.set_source_file(bootimg) |