[oe-commits] João Henrique Ferreira de Freitas : wic: Use partition label to be part of rootfs filename
git at git.openembedded.org
git at git.openembedded.org
Mon Mar 17 13:54:48 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 8cca4edf302a5cfe271857ab21ec633246cb9faf
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=8cca4edf302a5cfe271857ab21ec633246cb9faf
Author: João Henrique Ferreira de Freitas <joaohf at gmail.com>
Date: Sat Mar 15 18:17:50 2014 -0300
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=<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 at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/lib/mic/kickstart/custom_commands/partition.py | 4 ++--
1 file 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 c3bb9a5..8973edc 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)
More information about the Openembedded-commits
mailing list