mirror of
https://git.yoctoproject.org/poky
synced 2026-04-25 15:32:13 +02:00
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. (From OE-Core rev: 43558610a5793888ff2b18bd3a27c7ab558e5ad0) Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
e663d2f5c1
commit
94b805f1b4
@@ -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)
|
||||
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user