summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-03-29 00:12:06 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 10:10:35 +0100
commit13afd358682b8edc5c6a33f64ab32977030bfd65 (patch)
tree1cb9f441dac43bcff6812267d57a622cd1b320aa /scripts/lib
parentcbee7cb5f8d72374a756b80ff8e6d379046d03bd (diff)
downloadpoky-13afd358682b8edc5c6a33f64ab32977030bfd65.tar.gz
wic: Add option --rootfs-dir to --source
The '--rootfs-dir' option is optional and only takes efect is a partition is set up like this: part /standby --source rootfs --rootfs-dir=<special rootfs> ... So '--rootfs-dir' is used instead of bitbake ROOTFS_DIR variable or '-r' param. (From OE-Core rev: d486db593e6643bd10b8fe90257d547a9f341043) Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/mic/kickstart/custom_commands/partition.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py
index 8973edc110..887195fa60 100644
--- a/scripts/lib/mic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/mic/kickstart/custom_commands/partition.py
@@ -45,6 +45,7 @@ class Wic_PartData(Mic_PartData):
45 Mic_PartData.__init__(self, *args, **kwargs) 45 Mic_PartData.__init__(self, *args, **kwargs)
46 self.deleteRemovedAttrs() 46 self.deleteRemovedAttrs()
47 self.source = kwargs.get("source", None) 47 self.source = kwargs.get("source", None)
48 self.rootfs = kwargs.get("rootfs-dir", None)
48 self.source_file = "" 49 self.source_file = ""
49 self.size = 0 50 self.size = 0
50 51
@@ -53,6 +54,8 @@ class Wic_PartData(Mic_PartData):
53 54
54 if self.source: 55 if self.source:
55 retval += " --source=%s" % self.source 56 retval += " --source=%s" % self.source
57 if self.rootfs:
58 retval += " --rootfs-dir=%s" % self.rootfs
56 59
57 return retval 60 return retval
58 61
@@ -332,4 +335,7 @@ class Wic_Partition(Mic_Partition):
332 # and calculate partition size 335 # and calculate partition size
333 op.add_option("--source", type="string", action="store", 336 op.add_option("--source", type="string", action="store",
334 dest="source", default=None) 337 dest="source", default=None)
338 # use specified rootfs path to fill the partition
339 op.add_option("--rootfs-dir", type="string", action="store",
340 dest="rootfs", default=None)
335 return op 341 return op