mirror of
https://git.yoctoproject.org/poky
synced 2026-04-30 03:32:12 +02:00
wic: Remove gpt_parser
wic doesn't currently use it, so remove. (From OE-Core rev: d3a490d5421405bf9e002c6c65ffb831ea6b767e) 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
5a8bcfb562
commit
946dbec4eb
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user