summaryrefslogtreecommitdiff
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:32:38 +0000
commit7580942a66f84c2120763c2d9665e2cec8e25138 (patch)
tree3fae706088025148627626c0fa4a0c4c66a26cbf
parente9db0ae11d95f3c375b27d5c10606efd8b568fbf (diff)
downloadopenembedded-core-7580942a66f84c2120763c2d9665e2cec8e25138.tar.gz
openembedded-core-7580942a66f84c2120763c2d9665e2cec8e25138.tar.bz2
openembedded-core-7580942a66f84c2120763c2d9665e2cec8e25138.zip
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@mentor.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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):
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)