summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-04-22 12:32:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:58:44 +0100
commit514a87877e61d63626c21a61a1824c131031489d (patch)
tree368738886e4758c1095c9f5de50c7fcdfb0f8801
parent8d747c8b438ea7cf24e924a537bf76e8bbc8445e (diff)
downloadpoky-514a87877e61d63626c21a61a1824c131031489d.tar.gz
wic: add system_id argument to Image.add_partition
Added new argument to add_partition call to pass partition system id down the stack. [YOCTO #9096] (From OE-Core rev: f2733df697192c0010c17b7bbb02f8679cb8f313) 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/imager/direct.py3
-rw-r--r--scripts/lib/wic/utils/partitionedfs.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py
index a1b4249651..1937042e1a 100644
--- a/scripts/lib/wic/imager/direct.py
+++ b/scripts/lib/wic/imager/direct.py
@@ -267,7 +267,8 @@ class DirectImageCreator(BaseImageCreator):
267 align=part.align, 267 align=part.align,
268 no_table=part.no_table, 268 no_table=part.no_table,
269 part_type=part.part_type, 269 part_type=part.part_type,
270 uuid=part.uuid) 270 uuid=part.uuid,
271 system_id=part.system_id)
271 272
272 if fstab_path: 273 if fstab_path:
273 shutil.move(fstab_path + ".orig", fstab_path) 274 shutil.move(fstab_path + ".orig", fstab_path)
diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py
index ad596d26f2..9da4a7f2b4 100644
--- a/scripts/lib/wic/utils/partitionedfs.py
+++ b/scripts/lib/wic/utils/partitionedfs.py
@@ -87,7 +87,7 @@ class Image(object):
87 87
88 def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None, 88 def add_partition(self, size, disk_name, mountpoint, source_file=None, fstype=None,
89 label=None, fsopts=None, boot=False, align=None, no_table=False, 89 label=None, fsopts=None, boot=False, align=None, no_table=False,
90 part_type=None, uuid=None): 90 part_type=None, uuid=None, system_id=None):
91 """ Add the next partition. Prtitions have to be added in the 91 """ Add the next partition. Prtitions have to be added in the
92 first-to-last order. """ 92 first-to-last order. """
93 93