[oe-commits] [openembedded-core] 71/116: wic: don't throw away our created swap partition

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 979881e5283259b191de00cf93af8c5f3da5c94e
Author: Christopher Larson <chris_larson at mentor.com>
AuthorDate: Thu Feb 25 10:21:49 2016 -0700

    wic: don't throw away our created swap partition
    
    We were creating the partition, mkswap'ing it, and then not dd'ing it into
    place in the final image, as source_file wasn't being set for swap partitions.
    This would result in a swap partition that couldn't be enabled on target until
    mkswap was run.
    
    Signed-off-by: Christopher Larson <chris_larson at mentor.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/wic/partition.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 55bcfba..f40d1bc 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -106,6 +106,7 @@ class Partition(object):
             if self.fstype and self.fstype == "swap":
                 self.prepare_swap_partition(cr_workdir, oe_builddir,
                                             native_sysroot)
+                self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype)
             elif self.fstype:
                 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label,
                                              self.lineno, self.fstype)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.