summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-06-02 17:02:01 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-11 23:59:10 +0100
commit76f503535f52ef535f312ce4accb076b2b2091a4 (patch)
tree65657c43bbe592c750aac4516feba1b4787ac0eb
parentb7b3e4642c021a98463444a532eaae600a415244 (diff)
downloadpoky-76f503535f52ef535f312ce4accb076b2b2091a4.tar.gz
wic: Add gpt to the list of supported partition table formats
Only msdos partition table format was supported by wic source plugins. (From OE-Core rev: 0e119d469796a19fbeae61a7162fd70660c936a5) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-efi.py4
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py2
-rw-r--r--scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 2fc0357a5c..22c7b0a33e 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -61,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin):
61 61
62 kernel = "/bzImage" 62 kernel = "/bzImage"
63 63
64 if cr._ptable_format == 'msdos': 64 if cr._ptable_format in ('msdos', 'gpt'):
65 rootstr = rootdev 65 rootstr = rootdev
66 else: 66 else:
67 raise ImageError("Unsupported partition table format found") 67 raise ImageError("Unsupported partition table format found")
@@ -106,7 +106,7 @@ class BootimgEFIPlugin(SourcePlugin):
106 106
107 kernel = "/bzImage" 107 kernel = "/bzImage"
108 108
109 if cr._ptable_format == 'msdos': 109 if cr._ptable_format in ('msdos', 'gpt'):
110 rootstr = rootdev 110 rootstr = rootdev
111 else: 111 else:
112 raise ImageError("Unsupported partition table format found") 112 raise ImageError("Unsupported partition table format found")
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 9c638554c0..c28b9af036 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -100,7 +100,7 @@ class BootimgPcbiosPlugin(SourcePlugin):
100 kernel = "/vmlinuz" 100 kernel = "/vmlinuz"
101 syslinux_conf += "KERNEL " + kernel + "\n" 101 syslinux_conf += "KERNEL " + kernel + "\n"
102 102
103 if cr._ptable_format == 'msdos': 103 if cr._ptable_format in ('msdos', 'gpt'):
104 rootstr = rootdev 104 rootstr = rootdev
105 else: 105 else:
106 raise ImageError("Unsupported partition table format found") 106 raise ImageError("Unsupported partition table format found")
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
index ebf95ae097..29c873dc7b 100644
--- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
+++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py
@@ -101,7 +101,7 @@ class RootfsPlugin(SourcePlugin):
101 syslinux_conf += "LABEL linux\n" 101 syslinux_conf += "LABEL linux\n"
102 syslinux_conf += " KERNEL /boot/bzImage\n" 102 syslinux_conf += " KERNEL /boot/bzImage\n"
103 103
104 if image_creator._ptable_format == 'msdos': 104 if image_creator._ptable_format in ('msdos', 'gpt'):
105 rootstr = rootdev 105 rootstr = rootdev
106 else: 106 else:
107 raise ImageError("Unsupported partition table format found") 107 raise ImageError("Unsupported partition table format found")