aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoão Henrique Ferreira de Freitas <joaohf@gmail.com>2014-03-29 00:12:05 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 10:01:58 +0100
commitc7efb3a21618ce3069811042279a0d898237ac0f (patch)
tree0e8b98b8438ba4e4b8a3323c7f0e053a0eee86c9 /scripts
parent6042b097a8fc24f2b85eb9848fb007a3c6c090a9 (diff)
downloadopenembedded-core-c7efb3a21618ce3069811042279a0d898237ac0f.tar.gz
openembedded-core-c7efb3a21618ce3069811042279a0d898237ac0f.tar.bz2
openembedded-core-c7efb3a21618ce3069811042279a0d898237ac0f.zip
wic: Use partition label to be part of rootfs filename
When a partition from .wks file is set up like this: part /standby --source rootfs --rootfs-dir=<special rootfs> ... --label \ --label secondary This means that 'rootfs' must use '<special rootfs>' as rootfs and the default partition filename in /var/tmp/wic/build/ will be create using the '--label' as part of the name. E.g: /var/tmp/wic/build/rootfs_secondary.ext3 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')
-rw-r--r--scripts/lib/mic/kickstart/custom_commands/partition.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/mic/kickstart/custom_commands/partition.py b/scripts/lib/mic/kickstart/custom_commands/partition.py
index c3bb9a5b86..8973edc110 100644
--- a/scripts/lib/mic/kickstart/custom_commands/partition.py
+++ b/scripts/lib/mic/kickstart/custom_commands/partition.py
@@ -172,7 +172,7 @@ class Wic_PartData(Mic_PartData):
"""
image_rootfs = rootfs_dir
- rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype)
+ rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label ,self.fstype)
du_cmd = "du -ks %s" % image_rootfs
rc, out = exec_cmd(du_cmd)
@@ -217,7 +217,7 @@ class Wic_PartData(Mic_PartData):
Currently handles ext2/3/4 and btrfs.
"""
image_rootfs = rootfs_dir
- rootfs = "%s/rootfs.%s" % (cr_workdir, self.fstype)
+ rootfs = "%s/rootfs_%s.%s" % (cr_workdir, self.label, self.fstype)
du_cmd = "du -ks %s" % image_rootfs
rc, out = exec_cmd(du_cmd)