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:57:36 +0000 |
| commit | 94b805f1b4b9df596ab6275c6cd2dcada50c2ba4 (patch) | |
| tree | 0707123986c84347f7e85cde43db6b1f40b9fc95 /scripts/lib/image | |
| parent | e663d2f5c10ca2c71b287c5af19f74b0de0d7c7c (diff) | |
| download | ast2050-yocto-poky-94b805f1b4b9df596ab6275c6cd2dcada50c2ba4.zip ast2050-yocto-poky-94b805f1b4b9df596ab6275c6cd2dcada50c2ba4.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.
(From OE-Core rev: 43558610a5793888ff2b18bd3a27c7ab558e5ad0)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/image')
| -rw-r--r-- | scripts/lib/image/canned-wks/directdisk.wks | 2 | ||||
| -rw-r--r-- | scripts/lib/image/canned-wks/mkefidisk.wks | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/image/canned-wks/directdisk.wks b/scripts/lib/image/canned-wks/directdisk.wks index d54b382..397a929 100644 --- a/scripts/lib/image/canned-wks/directdisk.wks +++ b/scripts/lib/image/canned-wks/directdisk.wks @@ -3,7 +3,7 @@ # can directly dd to boot media. -part /boot --source bootimg --ondisk sda --fstype=msdos --label boot --active --align 1024 +part /boot --source bootimg-pcbios --ondisk sda --fstype=msdos --label boot --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 bootloader --timeout=0 --append="rootwait rootfstype=ext3 video=vesafb vga=0x318 console=tty0" diff --git a/scripts/lib/image/canned-wks/mkefidisk.wks b/scripts/lib/image/canned-wks/mkefidisk.wks index 8a3e1f6..e976bc8 100644 --- a/scripts/lib/image/canned-wks/mkefidisk.wks +++ b/scripts/lib/image/canned-wks/mkefidisk.wks @@ -2,7 +2,7 @@ # long-description: Creates a partitioned EFI disk image that the user # can directly dd to boot media. -part /boot --source bootimg --ondisk sda --fstype=efi --label msdos --active --align 1024 +part /boot --source bootimg-efi --ondisk sda --fstype=msdos --label msdos --active --align 1024 part / --source rootfs --ondisk sda --fstype=ext3 --label platform --align 1024 |
