summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2016-02-25 10:21:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-28 11:33:04 +0000
commitd4da534faa1075a545193170a2fe6cb71285b23c (patch)
treebad5f58fbc8b618e902e278c052c61c62bcf4cc2
parent5f82d17ac63f6d5b55f7b8d019c239620ab54596 (diff)
downloadpoky-d4da534faa1075a545193170a2fe6cb71285b23c.tar.gz
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. (From OE-Core rev: 7580942a66f84c2120763c2d9665e2cec8e25138) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--scripts/lib/wic/partition.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 55bcfbad40..f40d1bc8b6 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -106,6 +106,7 @@ class Partition(object):
106 if self.fstype and self.fstype == "swap": 106 if self.fstype and self.fstype == "swap":
107 self.prepare_swap_partition(cr_workdir, oe_builddir, 107 self.prepare_swap_partition(cr_workdir, oe_builddir,
108 native_sysroot) 108 native_sysroot)
109 self.source_file = "%s/fs.%s" % (cr_workdir, self.fstype)
109 elif self.fstype: 110 elif self.fstype:
110 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label, 111 rootfs = "%s/fs_%s.%s.%s" % (cr_workdir, self.label,
111 self.lineno, self.fstype) 112 self.lineno, self.fstype)