summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/kickstart/custom_commands/partition.py
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-09-02 13:58:06 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-02 23:46:50 +0100
commiteae139af81262b457cfb8ddf45a99523cc8a41cc (patch)
treecc68a5293b1b37bb81a59fd385aab1e9ab88ff8a /scripts/lib/wic/kickstart/custom_commands/partition.py
parente21d4b442437fac450070922ec74029ee1d10208 (diff)
downloadopenembedded-core-eae139af81262b457cfb8ddf45a99523cc8a41cc.tar.gz
openembedded-core-eae139af81262b457cfb8ddf45a99523cc8a41cc.tar.bz2
openembedded-core-eae139af81262b457cfb8ddf45a99523cc8a41cc.zip
wic: remove micpartition.py
Moved functionality of Mic_Partition and Mic_PartData classes from micpartition.py to Wic_Partition and Wic_PartData classes of partition.py module. Reduced level of inheritance. Removed confusing mic legacy names. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/kickstart/custom_commands/partition.py')
-rw-r--r--scripts/lib/wic/kickstart/custom_commands/partition.py41
1 files changed, 30 insertions, 11 deletions
diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py
index 045b290ed3..dd6edd2f10 100644
--- a/scripts/lib/wic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/wic/kickstart/custom_commands/partition.py
@@ -28,7 +28,7 @@ import os
import tempfile
import uuid
-from pykickstart.commands.partition import *
+from pykickstart.commands.partition import FC4_PartData, FC4_Partition
from wic.utils.oe.misc import *
from wic.kickstart.custom_commands import *
from wic.plugin import pluginmgr
@@ -39,13 +39,16 @@ partition_methods = {
"do_configure_partition":None,
}
-class Wic_PartData(Mic_PartData):
- removedKeywords = Mic_PartData.removedKeywords
- removedAttrs = Mic_PartData.removedAttrs
+class Wic_PartData(FC4_PartData):
+ removedKeywords = FC4_PartData.removedKeywords
+ removedAttrs = FC4_PartData.removedAttrs
def __init__(self, *args, **kwargs):
- Mic_PartData.__init__(self, *args, **kwargs)
+ FC4_PartData.__init__(self, *args, **kwargs)
self.deleteRemovedAttrs()
+ self.align = kwargs.get("align", None)
+ self.extopts = kwargs.get("extopts", None)
+ self.part_type = kwargs.get("part_type", None)
self.source = kwargs.get("source", None)
self.sourceparams = kwargs.get("sourceparams", None)
self.rootfs = kwargs.get("rootfs-dir", None)
@@ -59,8 +62,14 @@ class Wic_PartData(Mic_PartData):
self.size = 0
def _getArgsAsStr(self):
- retval = Mic_PartData._getArgsAsStr(self)
-
+ retval = FC4_PartData._getArgsAsStr(self)
+
+ if self.align:
+ retval += " --align=%d" % self.align
+ if self.extopts:
+ retval += " --extoptions=%s" % self.extopts
+ if self.part_type:
+ retval += " --part-type=%s" % self.part_type
if self.source:
retval += " --source=%s" % self.source
if self.sourceparams:
@@ -468,9 +477,10 @@ class Wic_PartData(Mic_PartData):
mkswap_cmd = "mkswap %s -U %s %s" % (label_str, str(uuid.uuid1()), fs)
exec_native_cmd(mkswap_cmd, native_sysroot)
-class Wic_Partition(Mic_Partition):
- removedKeywords = Mic_Partition.removedKeywords
- removedAttrs = Mic_Partition.removedAttrs
+
+class Wic_Partition(FC4_Partition):
+ removedKeywords = FC4_Partition.removedKeywords
+ removedAttrs = FC4_Partition.removedAttrs
def _getParser(self):
def overhead_cb(option, opt_str, value, parser):
@@ -479,7 +489,16 @@ class Wic_Partition(Mic_Partition):
(option, value))
setattr(parser.values, option.dest, value)
- op = Mic_Partition._getParser(self)
+ op = FC4_Partition._getParser(self)
+
+ # The alignment value is given in kBytes. e.g., value 8 means that
+ # the partition is aligned to start from 8096 byte boundary.
+ op.add_option("--align", type="int", action="store", dest="align",
+ default=None)
+ op.add_option("--extoptions", type="string", action="store", dest="extopts",
+ default=None)
+ op.add_option("--part-type", type="string", action="store", dest="part_type",
+ default=None)
# use specified source file to fill the partition
# and calculate partition size
op.add_option("--source", type="string", action="store",