diff options
| author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-08-04 12:36:49 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:52:16 +0100 |
| commit | d3a490d5421405bf9e002c6c65ffb831ea6b767e (patch) | |
| tree | 1985f233a07870f0c39cc78713e7e432e2da002f /scripts/lib/mic/plugins | |
| parent | b6ae106b5d28180a5890e837c87f3e91e5917638 (diff) | |
| download | openembedded-core-d3a490d5421405bf9e002c6c65ffb831ea6b767e.tar.gz openembedded-core-d3a490d5421405bf9e002c6c65ffb831ea6b767e.tar.bz2 openembedded-core-d3a490d5421405bf9e002c6c65ffb831ea6b767e.zip | |
wic: Remove gpt_parser
wic doesn't currently use it, so remove.
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'scripts/lib/mic/plugins')
| -rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-efi.py | 4 | ||||
| -rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-pcbios.py | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/scripts/lib/mic/plugins/source/bootimg-efi.py b/scripts/lib/mic/plugins/source/bootimg-efi.py index 95e1c059b9..d4a777198f 100644 --- a/scripts/lib/mic/plugins/source/bootimg-efi.py +++ b/scripts/lib/mic/plugins/source/bootimg-efi.py @@ -78,9 +78,7 @@ class BootimgEFIPlugin(SourcePlugin): if cr._ptable_format == 'msdos': rootstr = rootdev else: - if not root_part_uuid: - raise MountError("Cannot find the root GPT partition UUID") - rootstr = "PARTUUID=%s" % root_part_uuid + raise MountError("Unsupported partition table format found") grubefi_conf += "linux %s root=%s rootwait %s\n" \ % (kernel, rootstr, options) diff --git a/scripts/lib/mic/plugins/source/bootimg-pcbios.py b/scripts/lib/mic/plugins/source/bootimg-pcbios.py index 9959645606..34343205ac 100644 --- a/scripts/lib/mic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/mic/plugins/source/bootimg-pcbios.py @@ -50,9 +50,7 @@ class BootimgPcbiosPlugin(SourcePlugin): disk image. In this case, we install the MBR. """ mbrfile = "%s/syslinux/" % bootimg_dir - if cr._ptable_format == 'gpt': - mbrfile += "gptmbr.bin" - else: + if cr._ptable_format == 'msdos': mbrfile += "mbr.bin" if not os.path.exists(mbrfile): @@ -110,9 +108,7 @@ class BootimgPcbiosPlugin(SourcePlugin): if cr._ptable_format == 'msdos': rootstr = rootdev else: - if not root_part_uuid: - raise MountError("Cannot find the root GPT partition UUID") - rootstr = "PARTUUID=%s" % root_part_uuid + raise MountError("Unsupported partition table format found") syslinux_conf += "APPEND label=boot root=%s %s\n" % (rootstr, options) |